Compare commits
17 Commits
Author | SHA1 | Date | |
---|---|---|---|
61f69c93f2 | |||
f07d361f89 | |||
6526c6fadf | |||
88ee59cd5f | |||
7bd26a9458 | |||
eff64f9759 | |||
209ac666cc | |||
f3bda46b3c | |||
dd2a36e9a8 | |||
53e8ce8afb | |||
e245d1e92b | |||
278a5ef865 | |||
d4b240ac1f | |||
1ac238922c | |||
7b6245023b | |||
4927212da3 | |||
41ca547264 |
4
.gitignore
vendored
4
.gitignore
vendored
@ -27,3 +27,7 @@
|
||||
*.exe
|
||||
*.out
|
||||
*.app
|
||||
|
||||
# python property:
|
||||
*.pyc
|
||||
__pycache__/
|
||||
|
510
LICENSE
510
LICENSE
@ -1,201 +1,373 @@
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
Mozilla Public License Version 2.0
|
||||
==================================
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
1. Definitions
|
||||
--------------
|
||||
|
||||
1. Definitions.
|
||||
1.1. "Contributor"
|
||||
means each individual or legal entity that creates, contributes to
|
||||
the creation of, or owns Covered Software.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
1.2. "Contributor Version"
|
||||
means the combination of the Contributions of others (if any) used
|
||||
by a Contributor and that particular Contributor's Contribution.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
1.3. "Contribution"
|
||||
means Covered Software of a particular Contributor.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
1.4. "Covered Software"
|
||||
means Source Code Form to which the initial Contributor has attached
|
||||
the notice in Exhibit A, the Executable Form of such Source Code
|
||||
Form, and Modifications of such Source Code Form, in each case
|
||||
including portions thereof.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
1.5. "Incompatible With Secondary Licenses"
|
||||
means
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
(a) that the initial Contributor has attached the notice described
|
||||
in Exhibit B to the Covered Software; or
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
(b) that the Covered Software was made available under the terms of
|
||||
version 1.1 or earlier of the License, but not also under the
|
||||
terms of a Secondary License.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
1.6. "Executable Form"
|
||||
means any form of the work other than Source Code Form.
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
1.7. "Larger Work"
|
||||
means a work that combines Covered Software with other material, in
|
||||
a separate file or files, that is not Covered Software.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
1.8. "License"
|
||||
means this document.
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
1.9. "Licensable"
|
||||
means having the right to grant, to the maximum extent possible,
|
||||
whether at the time of the initial grant or subsequently, any and
|
||||
all of the rights conveyed by this License.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
1.10. "Modifications"
|
||||
means any of the following:
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
(a) any file in Source Code Form that results from an addition to,
|
||||
deletion from, or modification of the contents of Covered
|
||||
Software; or
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
(b) any new file in Source Code Form that contains any Covered
|
||||
Software.
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
1.11. "Patent Claims" of a Contributor
|
||||
means any patent claim(s), including without limitation, method,
|
||||
process, and apparatus claims, in any patent Licensable by such
|
||||
Contributor that would be infringed, but for the grant of the
|
||||
License, by the making, using, selling, offering for sale, having
|
||||
made, import, or transfer of either its Contributions or its
|
||||
Contributor Version.
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
1.12. "Secondary License"
|
||||
means either the GNU General Public License, Version 2.0, the GNU
|
||||
Lesser General Public License, Version 2.1, the GNU Affero General
|
||||
Public License, Version 3.0, or any later versions of those
|
||||
licenses.
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
1.13. "Source Code Form"
|
||||
means the form of the work preferred for making modifications.
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
1.14. "You" (or "Your")
|
||||
means an individual or a legal entity exercising rights under this
|
||||
License. For legal entities, "You" includes any entity that
|
||||
controls, is controlled by, or is under common control with You. For
|
||||
purposes of this definition, "control" means (a) the power, direct
|
||||
or indirect, to cause the direction or management of such entity,
|
||||
whether by contract or otherwise, or (b) ownership of more than
|
||||
fifty percent (50%) of the outstanding shares or beneficial
|
||||
ownership of such entity.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
2. License Grants and Conditions
|
||||
--------------------------------
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
2.1. Grants
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
||||
non-exclusive license:
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
(a) under intellectual property rights (other than patent or trademark)
|
||||
Licensable by such Contributor to use, reproduce, make available,
|
||||
modify, display, perform, distribute, and otherwise exploit its
|
||||
Contributions, either on an unmodified basis, with Modifications, or
|
||||
as part of a Larger Work; and
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
||||
for sale, have made, import, and otherwise transfer either its
|
||||
Contributions or its Contributor Version.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
2.2. Effective Date
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
The licenses granted in Section 2.1 with respect to any Contribution
|
||||
become effective for each Contribution on the date the Contributor first
|
||||
distributes such Contribution.
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
2.3. Limitations on Grant Scope
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "{}"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
The licenses granted in this Section 2 are the only rights granted under
|
||||
this License. No additional rights or licenses will be implied from the
|
||||
distribution or licensing of Covered Software under this License.
|
||||
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
||||
Contributor:
|
||||
|
||||
Copyright {yyyy} {name of copyright owner}
|
||||
(a) for any code that a Contributor has removed from Covered Software;
|
||||
or
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
(b) for infringements caused by: (i) Your and any other third party's
|
||||
modifications of Covered Software, or (ii) the combination of its
|
||||
Contributions with other software (except as part of its Contributor
|
||||
Version); or
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
(c) under Patent Claims infringed by Covered Software in the absence of
|
||||
its Contributions.
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
This License does not grant any rights in the trademarks, service marks,
|
||||
or logos of any Contributor (except as may be necessary to comply with
|
||||
the notice requirements in Section 3.4).
|
||||
|
||||
2.4. Subsequent Licenses
|
||||
|
||||
No Contributor makes additional grants as a result of Your choice to
|
||||
distribute the Covered Software under a subsequent version of this
|
||||
License (see Section 10.2) or under the terms of a Secondary License (if
|
||||
permitted under the terms of Section 3.3).
|
||||
|
||||
2.5. Representation
|
||||
|
||||
Each Contributor represents that the Contributor believes its
|
||||
Contributions are its original creation(s) or it has sufficient rights
|
||||
to grant the rights to its Contributions conveyed by this License.
|
||||
|
||||
2.6. Fair Use
|
||||
|
||||
This License is not intended to limit any rights You have under
|
||||
applicable copyright doctrines of fair use, fair dealing, or other
|
||||
equivalents.
|
||||
|
||||
2.7. Conditions
|
||||
|
||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
||||
in Section 2.1.
|
||||
|
||||
3. Responsibilities
|
||||
-------------------
|
||||
|
||||
3.1. Distribution of Source Form
|
||||
|
||||
All distribution of Covered Software in Source Code Form, including any
|
||||
Modifications that You create or to which You contribute, must be under
|
||||
the terms of this License. You must inform recipients that the Source
|
||||
Code Form of the Covered Software is governed by the terms of this
|
||||
License, and how they can obtain a copy of this License. You may not
|
||||
attempt to alter or restrict the recipients' rights in the Source Code
|
||||
Form.
|
||||
|
||||
3.2. Distribution of Executable Form
|
||||
|
||||
If You distribute Covered Software in Executable Form then:
|
||||
|
||||
(a) such Covered Software must also be made available in Source Code
|
||||
Form, as described in Section 3.1, and You must inform recipients of
|
||||
the Executable Form how they can obtain a copy of such Source Code
|
||||
Form by reasonable means in a timely manner, at a charge no more
|
||||
than the cost of distribution to the recipient; and
|
||||
|
||||
(b) You may distribute such Executable Form under the terms of this
|
||||
License, or sublicense it under different terms, provided that the
|
||||
license for the Executable Form does not attempt to limit or alter
|
||||
the recipients' rights in the Source Code Form under this License.
|
||||
|
||||
3.3. Distribution of a Larger Work
|
||||
|
||||
You may create and distribute a Larger Work under terms of Your choice,
|
||||
provided that You also comply with the requirements of this License for
|
||||
the Covered Software. If the Larger Work is a combination of Covered
|
||||
Software with a work governed by one or more Secondary Licenses, and the
|
||||
Covered Software is not Incompatible With Secondary Licenses, this
|
||||
License permits You to additionally distribute such Covered Software
|
||||
under the terms of such Secondary License(s), so that the recipient of
|
||||
the Larger Work may, at their option, further distribute the Covered
|
||||
Software under the terms of either this License or such Secondary
|
||||
License(s).
|
||||
|
||||
3.4. Notices
|
||||
|
||||
You may not remove or alter the substance of any license notices
|
||||
(including copyright notices, patent notices, disclaimers of warranty,
|
||||
or limitations of liability) contained within the Source Code Form of
|
||||
the Covered Software, except that You may alter any license notices to
|
||||
the extent required to remedy known factual inaccuracies.
|
||||
|
||||
3.5. Application of Additional Terms
|
||||
|
||||
You may choose to offer, and to charge a fee for, warranty, support,
|
||||
indemnity or liability obligations to one or more recipients of Covered
|
||||
Software. However, You may do so only on Your own behalf, and not on
|
||||
behalf of any Contributor. You must make it absolutely clear that any
|
||||
such warranty, support, indemnity, or liability obligation is offered by
|
||||
You alone, and You hereby agree to indemnify every Contributor for any
|
||||
liability incurred by such Contributor as a result of warranty, support,
|
||||
indemnity or liability terms You offer. You may include additional
|
||||
disclaimers of warranty and limitations of liability specific to any
|
||||
jurisdiction.
|
||||
|
||||
4. Inability to Comply Due to Statute or Regulation
|
||||
---------------------------------------------------
|
||||
|
||||
If it is impossible for You to comply with any of the terms of this
|
||||
License with respect to some or all of the Covered Software due to
|
||||
statute, judicial order, or regulation then You must: (a) comply with
|
||||
the terms of this License to the maximum extent possible; and (b)
|
||||
describe the limitations and the code they affect. Such description must
|
||||
be placed in a text file included with all distributions of the Covered
|
||||
Software under this License. Except to the extent prohibited by statute
|
||||
or regulation, such description must be sufficiently detailed for a
|
||||
recipient of ordinary skill to be able to understand it.
|
||||
|
||||
5. Termination
|
||||
--------------
|
||||
|
||||
5.1. The rights granted under this License will terminate automatically
|
||||
if You fail to comply with any of its terms. However, if You become
|
||||
compliant, then the rights granted under this License from a particular
|
||||
Contributor are reinstated (a) provisionally, unless and until such
|
||||
Contributor explicitly and finally terminates Your grants, and (b) on an
|
||||
ongoing basis, if such Contributor fails to notify You of the
|
||||
non-compliance by some reasonable means prior to 60 days after You have
|
||||
come back into compliance. Moreover, Your grants from a particular
|
||||
Contributor are reinstated on an ongoing basis if such Contributor
|
||||
notifies You of the non-compliance by some reasonable means, this is the
|
||||
first time You have received notice of non-compliance with this License
|
||||
from such Contributor, and You become compliant prior to 30 days after
|
||||
Your receipt of the notice.
|
||||
|
||||
5.2. If You initiate litigation against any entity by asserting a patent
|
||||
infringement claim (excluding declaratory judgment actions,
|
||||
counter-claims, and cross-claims) alleging that a Contributor Version
|
||||
directly or indirectly infringes any patent, then the rights granted to
|
||||
You by any and all Contributors for the Covered Software under Section
|
||||
2.1 of this License shall terminate.
|
||||
|
||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
||||
end user license agreements (excluding distributors and resellers) which
|
||||
have been validly granted by You or Your distributors under this License
|
||||
prior to termination shall survive termination.
|
||||
|
||||
************************************************************************
|
||||
* *
|
||||
* 6. Disclaimer of Warranty *
|
||||
* ------------------------- *
|
||||
* *
|
||||
* Covered Software is provided under this License on an "as is" *
|
||||
* basis, without warranty of any kind, either expressed, implied, or *
|
||||
* statutory, including, without limitation, warranties that the *
|
||||
* Covered Software is free of defects, merchantable, fit for a *
|
||||
* particular purpose or non-infringing. The entire risk as to the *
|
||||
* quality and performance of the Covered Software is with You. *
|
||||
* Should any Covered Software prove defective in any respect, You *
|
||||
* (not any Contributor) assume the cost of any necessary servicing, *
|
||||
* repair, or correction. This disclaimer of warranty constitutes an *
|
||||
* essential part of this License. No use of any Covered Software is *
|
||||
* authorized under this License except under this disclaimer. *
|
||||
* *
|
||||
************************************************************************
|
||||
|
||||
************************************************************************
|
||||
* *
|
||||
* 7. Limitation of Liability *
|
||||
* -------------------------- *
|
||||
* *
|
||||
* Under no circumstances and under no legal theory, whether tort *
|
||||
* (including negligence), contract, or otherwise, shall any *
|
||||
* Contributor, or anyone who distributes Covered Software as *
|
||||
* permitted above, be liable to You for any direct, indirect, *
|
||||
* special, incidental, or consequential damages of any character *
|
||||
* including, without limitation, damages for lost profits, loss of *
|
||||
* goodwill, work stoppage, computer failure or malfunction, or any *
|
||||
* and all other commercial damages or losses, even if such party *
|
||||
* shall have been informed of the possibility of such damages. This *
|
||||
* limitation of liability shall not apply to liability for death or *
|
||||
* personal injury resulting from such party's negligence to the *
|
||||
* extent applicable law prohibits such limitation. Some *
|
||||
* jurisdictions do not allow the exclusion or limitation of *
|
||||
* incidental or consequential damages, so this exclusion and *
|
||||
* limitation may not apply to You. *
|
||||
* *
|
||||
************************************************************************
|
||||
|
||||
8. Litigation
|
||||
-------------
|
||||
|
||||
Any litigation relating to this License may be brought only in the
|
||||
courts of a jurisdiction where the defendant maintains its principal
|
||||
place of business and such litigation shall be governed by laws of that
|
||||
jurisdiction, without reference to its conflict-of-law provisions.
|
||||
Nothing in this Section shall prevent a party's ability to bring
|
||||
cross-claims or counter-claims.
|
||||
|
||||
9. Miscellaneous
|
||||
----------------
|
||||
|
||||
This License represents the complete agreement concerning the subject
|
||||
matter hereof. If any provision of this License is held to be
|
||||
unenforceable, such provision shall be reformed only to the extent
|
||||
necessary to make it enforceable. Any law or regulation which provides
|
||||
that the language of a contract shall be construed against the drafter
|
||||
shall not be used to construe this License against a Contributor.
|
||||
|
||||
10. Versions of the License
|
||||
---------------------------
|
||||
|
||||
10.1. New Versions
|
||||
|
||||
Mozilla Foundation is the license steward. Except as provided in Section
|
||||
10.3, no one other than the license steward has the right to modify or
|
||||
publish new versions of this License. Each version will be given a
|
||||
distinguishing version number.
|
||||
|
||||
10.2. Effect of New Versions
|
||||
|
||||
You may distribute the Covered Software under the terms of the version
|
||||
of the License under which You originally received the Covered Software,
|
||||
or under the terms of any subsequent version published by the license
|
||||
steward.
|
||||
|
||||
10.3. Modified Versions
|
||||
|
||||
If you create software not governed by this License, and you want to
|
||||
create a new license for such software, you may create and use a
|
||||
modified version of this License if you rename the license and remove
|
||||
any references to the name of the license steward (except to note that
|
||||
such modified license differs from this License).
|
||||
|
||||
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
||||
Licenses
|
||||
|
||||
If You choose to distribute Source Code Form that is Incompatible With
|
||||
Secondary Licenses under the terms of this version of the License, the
|
||||
notice described in Exhibit B of this License must be attached.
|
||||
|
||||
Exhibit A - Source Code Form License Notice
|
||||
-------------------------------------------
|
||||
|
||||
This Source Code Form is subject to the terms of the Mozilla Public
|
||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
If it is not possible or desirable to put the notice in a particular
|
||||
file, then You may include the notice in a location (such as a LICENSE
|
||||
file in a relevant directory) where a recipient would be likely to look
|
||||
for such a notice.
|
||||
|
||||
You may add additional accurate notices of copyright ownership.
|
||||
|
||||
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
||||
---------------------------------------------------------
|
||||
|
||||
This Source Code Form is "Incompatible With Secondary Licenses", as
|
||||
defined by the Mozilla Public License, v. 2.0.
|
@ -1,7 +1,7 @@
|
||||
e-chrono
|
||||
========
|
||||
|
||||
`e-chrono` Virualize the std::chono interface to permit to have a slow virtual clock
|
||||
`e-chrono` time interface (wrapped multi-os)
|
||||
|
||||
Release (master)
|
||||
----------------
|
||||
@ -60,15 +60,15 @@ Compile software:
|
||||
lutin -C -P echrono
|
||||
|
||||
|
||||
License (APACHE v2.0)
|
||||
License (MPL v2.0)
|
||||
=====================
|
||||
Copyright echrono Edouard DUPIN
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
Licensed under the Mozilla Public License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
https://www.mozilla.org/MPL/2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
|
@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
|
||||
@ -9,21 +9,29 @@
|
||||
#include <echrono/Steady.hpp>
|
||||
#include <echrono/Duration.hpp>
|
||||
#include <echrono/debug.hpp>
|
||||
#include <etk/UString.hpp>
|
||||
|
||||
echrono::Clock::Clock() {
|
||||
m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(0));
|
||||
#include <etk/typeInfo.hpp>
|
||||
ETK_DECLARE_TYPE(echrono::Clock);
|
||||
|
||||
echrono::Clock::Clock() :
|
||||
m_data(0) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Clock::Clock(int64_t _valNano) {
|
||||
m_data = std::chrono::steady_clock::time_point(std::chrono::nanoseconds(_valNano));
|
||||
echrono::Clock::Clock(int64_t _valNano) :
|
||||
m_data(_valNano) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Clock::Clock(int64_t _valSec, int64_t _valNano) {
|
||||
m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(_valSec));
|
||||
m_data += std::chrono::nanoseconds(_valNano);
|
||||
echrono::Clock::Clock(int64_t _valSec, int32_t _valNano) :
|
||||
m_data(_valSec*1000000000LL +_valNano) {
|
||||
|
||||
}
|
||||
echrono::Clock::Clock(const std::chrono::steady_clock::time_point& _val) {
|
||||
m_data = _val;
|
||||
|
||||
echrono::Clock::Clock(const echrono::Clock& _val):
|
||||
m_data(_val.m_data) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Clock::Clock(const echrono::Steady& _val) {
|
||||
@ -31,7 +39,7 @@ echrono::Clock::Clock(const echrono::Steady& _val) {
|
||||
}
|
||||
|
||||
echrono::Clock echrono::Clock::now() {
|
||||
return echrono::Clock(std::chrono::steady_clock::now());
|
||||
return echrono::Clock(echrono::Steady::now());
|
||||
}
|
||||
|
||||
const echrono::Clock& echrono::Clock::operator= (const echrono::Clock& _obj) {
|
||||
@ -64,60 +72,41 @@ bool echrono::Clock::operator>= (const echrono::Clock& _obj) const {
|
||||
}
|
||||
|
||||
const echrono::Clock& echrono::Clock::operator+= (const echrono::Duration& _obj) {
|
||||
#if defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs)
|
||||
std::chrono::microseconds ms = std::chrono::duration_cast<std::chrono::microseconds>(_obj.get());
|
||||
m_data += ms;
|
||||
#else
|
||||
m_data += _obj.get();
|
||||
#endif
|
||||
m_data += _obj.get();
|
||||
return *this;
|
||||
}
|
||||
|
||||
echrono::Clock echrono::Clock::operator+ (const echrono::Duration& _obj) const {
|
||||
echrono::Clock time(m_data);
|
||||
time += _obj;
|
||||
return time;
|
||||
echrono::Clock tmp(m_data);
|
||||
tmp += _obj;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
const echrono::Clock& echrono::Clock::operator-= (const echrono::Duration& _obj) {
|
||||
#if defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs)
|
||||
std::chrono::microseconds ms = std::chrono::duration_cast<std::chrono::microseconds>(_obj.get());
|
||||
m_data -= ms;
|
||||
#else
|
||||
m_data -= _obj.get();
|
||||
#endif
|
||||
m_data -= _obj.get();
|
||||
return *this;
|
||||
}
|
||||
|
||||
echrono::Clock echrono::Clock::operator- (const echrono::Duration& _obj) const {
|
||||
echrono::Clock time(m_data);
|
||||
time -= _obj;
|
||||
return time;
|
||||
echrono::Clock tmp(m_data);
|
||||
tmp -= _obj;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
echrono::Duration echrono::Clock::operator- (const echrono::Clock& _obj) const {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(m_data.time_since_epoch());
|
||||
std::chrono::nanoseconds ns2 = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.m_data.time_since_epoch());
|
||||
echrono::Duration duration(ns);
|
||||
echrono::Duration duration2(ns2);
|
||||
return duration - duration2;
|
||||
return echrono::Duration(int64_t(m_data - _obj.m_data));
|
||||
}
|
||||
|
||||
void echrono::Clock::reset() {
|
||||
m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(0));
|
||||
m_data = 0;
|
||||
}
|
||||
|
||||
int64_t echrono::Clock::count() {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(m_data.time_since_epoch());
|
||||
return ns.count()/1000;
|
||||
}
|
||||
|
||||
std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Clock& _obj) {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
|
||||
int64_t totalSecond = ns.count()/1000000000;
|
||||
int64_t millisecond = (ns.count()%1000000000)/1000000;
|
||||
int64_t microsecond = (ns.count()%1000000)/1000;
|
||||
int64_t nanosecond = ns.count()%1000;
|
||||
etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Clock& _obj) {
|
||||
int64_t ns = _obj.get();
|
||||
int64_t totalSecond = ns/1000000000;
|
||||
int64_t millisecond = (ns%1000000000)/1000000;
|
||||
int64_t microsecond = (ns%1000000)/1000;
|
||||
int64_t nanosecond = ns%1000;
|
||||
//_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns";
|
||||
int32_t second = totalSecond % 60;
|
||||
int32_t minute = (totalSecond/60)%60;
|
||||
@ -159,14 +148,10 @@ std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Clock& _obj
|
||||
|
||||
|
||||
namespace etk {
|
||||
template<> std::string to_string<echrono::Clock>(const echrono::Clock& _obj) {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
|
||||
return etk::to_string(ns.count());
|
||||
template<> etk::String toString<echrono::Clock>(const echrono::Clock& _obj) {
|
||||
return etk::toString(_obj.get());
|
||||
}
|
||||
template<> etk::UString toUString<echrono::Clock>(const echrono::Clock& _obj) {
|
||||
return etk::toUString(_obj.get());
|
||||
}
|
||||
#if __CPP_VERSION__ >= 2011
|
||||
template<> std::u32string to_u32string<echrono::Clock>(const echrono::Clock& _obj) {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
|
||||
return etk::to_u32string(ns.count());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
@ -1,13 +1,12 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <etk/String.hpp>
|
||||
#include <etk/types.hpp>
|
||||
#include <chrono>
|
||||
|
||||
namespace echrono {
|
||||
class Duration;
|
||||
@ -17,23 +16,22 @@ namespace echrono {
|
||||
*/
|
||||
class Clock {
|
||||
private:
|
||||
std::chrono::steady_clock::time_point m_data;
|
||||
int64_t m_data; // stored in ns
|
||||
public:
|
||||
Clock();
|
||||
//Clock(const echrono::Duration& _val) {}; //value in second
|
||||
Clock(int64_t _valNano);
|
||||
Clock(int64_t _valSec, int64_t _valNano);
|
||||
Clock(const std::chrono::steady_clock::time_point& _val);
|
||||
Clock(int64_t _valSec, int32_t _valNano);
|
||||
Clock(const echrono::Clock& _val);
|
||||
Clock(const echrono::Steady& _val);
|
||||
~Clock() {};
|
||||
const std::chrono::steady_clock::time_point& get() const {
|
||||
int64_t get() const {
|
||||
return m_data;
|
||||
}
|
||||
/**
|
||||
* @brief return the number of us since start of clock (can be <0)
|
||||
* @return a number un us since start of clock
|
||||
*/
|
||||
int64_t count();
|
||||
static Clock now();
|
||||
const Clock& operator= (const echrono::Clock& _obj );
|
||||
bool operator== (const echrono::Clock& _obj) const;
|
||||
@ -49,6 +47,8 @@ namespace echrono {
|
||||
Duration operator- (const echrono::Clock& _obj) const;
|
||||
void reset();
|
||||
};
|
||||
std::ostream& operator <<(std::ostream& _os, const echrono::Clock& _obj);
|
||||
etk::Stream& operator <<(etk::Stream& _os, const echrono::Clock& _obj);
|
||||
}
|
||||
|
||||
|
||||
#include <echrono/Duration.hpp>
|
||||
|
@ -1,54 +1,40 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
|
||||
#include <echrono/Time.hpp>
|
||||
#include <echrono/Duration.hpp>
|
||||
#include <echrono/debug.hpp>
|
||||
#include <etk/UString.hpp>
|
||||
|
||||
echrono::Duration::Duration() {
|
||||
m_data = std::chrono::nanoseconds(0);
|
||||
#include <etk/typeInfo.hpp>
|
||||
ETK_DECLARE_TYPE(echrono::Duration);
|
||||
|
||||
echrono::Duration::Duration() :
|
||||
m_data(0) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Duration::Duration(int _val) {
|
||||
m_data = std::chrono::nanoseconds(_val);
|
||||
echrono::Duration::Duration(int _val) :
|
||||
m_data(_val) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Duration::Duration(int64_t _valSec, int64_t _valNano) {
|
||||
m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::seconds(_valSec));
|
||||
m_data += std::chrono::nanoseconds(_valNano);
|
||||
echrono::Duration::Duration(int64_t _valSec, int32_t _valNano) :
|
||||
m_data(_valSec*1000000000LL +_valNano) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Duration::Duration(int64_t _val) {
|
||||
m_data = std::chrono::nanoseconds(_val);
|
||||
echrono::Duration::Duration(int64_t _val) :
|
||||
m_data(_val) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Duration::Duration(double _val) {
|
||||
m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::seconds(int64_t(_val)));
|
||||
m_data += std::chrono::nanoseconds(int64_t(((_val - int64_t(_val)) * 1000000000.0)));
|
||||
}
|
||||
|
||||
echrono::Duration::Duration(echrono::nanoseconds _val) {
|
||||
m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(_val);
|
||||
}
|
||||
|
||||
echrono::Duration::Duration(echrono::microseconds _val) {
|
||||
m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(_val);
|
||||
}
|
||||
|
||||
echrono::Duration::Duration(echrono::milliseconds _val) {
|
||||
m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(_val);
|
||||
}
|
||||
|
||||
echrono::Duration::Duration(echrono::seconds _val) {
|
||||
m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(_val);
|
||||
}
|
||||
|
||||
int64_t echrono::Duration::count() const {
|
||||
return m_data.count();
|
||||
m_data = int64_t(_val*1000000000.0);
|
||||
}
|
||||
|
||||
const echrono::Duration& echrono::Duration::operator= (const echrono::Duration& _obj) {
|
||||
@ -74,27 +60,25 @@ bool echrono::Duration::operator>= (const echrono::Duration& _obj) const {
|
||||
return m_data >= _obj.m_data;
|
||||
}
|
||||
|
||||
float echrono::Duration::toSeconds() const {
|
||||
return float(double(m_data.count()) * 0.000000001);
|
||||
double echrono::Duration::toSeconds() const {
|
||||
return double(m_data) * 0.000000001;
|
||||
}
|
||||
|
||||
const echrono::Duration& echrono::Duration::operator/= (float _value) {
|
||||
m_data = std::chrono::nanoseconds(int64_t(double(m_data.count()) / _value));
|
||||
m_data = int64_t(double(m_data) / _value);
|
||||
return *this;
|
||||
}
|
||||
echrono::Duration echrono::Duration::operator/ (float _value) const {
|
||||
echrono::Duration tmpp(int64_t(double(m_data.count()) / _value));
|
||||
return tmpp;
|
||||
return echrono::Duration(int64_t(double(m_data) / _value));
|
||||
}
|
||||
|
||||
|
||||
const echrono::Duration& echrono::Duration::operator*= (float _value) {
|
||||
m_data = std::chrono::nanoseconds(int64_t(double(m_data.count()) * _value));
|
||||
m_data = int64_t(double(m_data) * _value);
|
||||
return *this;
|
||||
}
|
||||
echrono::Duration echrono::Duration::operator* (float _value) const {
|
||||
echrono::Duration tmpp(int64_t(double(m_data.count()) * _value));
|
||||
return tmpp;
|
||||
return echrono::Duration(int64_t(double(m_data) * _value));
|
||||
}
|
||||
|
||||
const echrono::Duration& echrono::Duration::operator+= (const echrono::Duration& _obj) {
|
||||
@ -102,9 +86,9 @@ const echrono::Duration& echrono::Duration::operator+= (const echrono::Duration&
|
||||
return *this;
|
||||
}
|
||||
echrono::Duration echrono::Duration::operator+ (const echrono::Duration& _obj) const {
|
||||
echrono::Duration tmpp(m_data);
|
||||
tmpp.m_data += _obj.m_data;
|
||||
return tmpp;
|
||||
echrono::Duration tmp(m_data);
|
||||
tmp.m_data += _obj.m_data;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
const echrono::Duration& echrono::Duration::operator-= (const echrono::Duration& _obj) {
|
||||
@ -112,39 +96,39 @@ const echrono::Duration& echrono::Duration::operator-= (const echrono::Duration&
|
||||
return *this;
|
||||
}
|
||||
echrono::Duration echrono::Duration::operator- (const echrono::Duration& _obj) const {
|
||||
echrono::Duration tmpp(m_data);
|
||||
tmpp.m_data -= _obj.m_data;
|
||||
return tmpp;
|
||||
echrono::Duration tmp(m_data);
|
||||
tmp.m_data -= _obj.m_data;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
echrono::Duration& echrono::Duration::operator++() {
|
||||
m_data += std::chrono::nanoseconds(1);
|
||||
m_data++;
|
||||
return *this;
|
||||
}
|
||||
echrono::Duration echrono::Duration::operator++(int _unused) {
|
||||
echrono::Duration result(m_data);
|
||||
m_data += std::chrono::nanoseconds(1);
|
||||
return result;
|
||||
echrono::Duration tmp(m_data);
|
||||
m_data++;
|
||||
return tmp;
|
||||
}
|
||||
echrono::Duration& echrono::Duration::operator--() {
|
||||
m_data -= std::chrono::nanoseconds(1);
|
||||
m_data -= 1;
|
||||
return *this;
|
||||
}
|
||||
echrono::Duration echrono::Duration::operator--(int _unused) {
|
||||
m_data -= std::chrono::nanoseconds(1);
|
||||
echrono::Duration result(m_data);
|
||||
return result;
|
||||
echrono::Duration tmp(m_data);
|
||||
m_data--;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
void echrono::Duration::reset() {
|
||||
m_data = std::chrono::nanoseconds(0);
|
||||
m_data = 0;
|
||||
}
|
||||
|
||||
std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Duration& _obj) {
|
||||
int64_t totalSecond = _obj.count()/1000000000;
|
||||
int64_t millisecond = (_obj.count()%1000000000)/1000000;
|
||||
int64_t microsecond = (_obj.count()%1000000)/1000;
|
||||
int64_t nanosecond = _obj.count()%1000;
|
||||
etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Duration& _obj) {
|
||||
int64_t totalSecond = _obj.get()/1000000000;
|
||||
int64_t millisecond = (_obj.get()%1000000000)/1000000;
|
||||
int64_t microsecond = (_obj.get()%1000000)/1000;
|
||||
int64_t nanosecond = _obj.get()%1000;
|
||||
//_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns";
|
||||
int32_t second = totalSecond % 60;
|
||||
int32_t minute = (totalSecond/60)%60;
|
||||
@ -185,14 +169,12 @@ std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Duration& _
|
||||
}
|
||||
|
||||
namespace etk {
|
||||
template<> std::string to_string<echrono::Duration>(const echrono::Duration& _obj) {
|
||||
return etk::to_string(_obj.count());
|
||||
template<> etk::String toString<echrono::Duration>(const echrono::Duration& _obj) {
|
||||
return etk::toString(_obj.get());
|
||||
}
|
||||
template<> etk::UString toUString<echrono::Duration>(const echrono::Duration& _obj) {
|
||||
return etk::toUString(_obj.get());
|
||||
}
|
||||
#if __CPP_VERSION__ >= 2011
|
||||
template<> std::u32string to_u32string<echrono::Duration>(const echrono::Duration& _obj) {
|
||||
return etk::to_u32string(_obj.count());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@ -1,35 +1,49 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <etk/types.hpp>
|
||||
#include <chrono>
|
||||
|
||||
namespace echrono {
|
||||
using nanoseconds = std::chrono::nanoseconds;
|
||||
using microseconds = std::chrono::microseconds;
|
||||
using milliseconds = std::chrono::milliseconds;
|
||||
using seconds = std::chrono::seconds;
|
||||
template<int64_t ECHRONO_FACTOR>
|
||||
class genericOffsetTime {
|
||||
private:
|
||||
int64_t m_duration;
|
||||
public:
|
||||
genericOffsetTime(int64_t _offsetSinceEpock=0) :
|
||||
m_duration(_offsetSinceEpock*int64_t(ECHRONO_FACTOR)) {
|
||||
// nothing to do.
|
||||
}
|
||||
int64_t get() const {
|
||||
return m_duration;
|
||||
}
|
||||
};
|
||||
using nanoseconds = genericOffsetTime<1LL>;
|
||||
using microseconds = genericOffsetTime<1000LL>;
|
||||
using milliseconds = genericOffsetTime<1000000LL>;
|
||||
using seconds = genericOffsetTime<1000000000LL>;
|
||||
using minutes = genericOffsetTime<60000000000LL>;
|
||||
using hours = genericOffsetTime<3600000000000LL>;
|
||||
using days = genericOffsetTime<86400000000000LL>;
|
||||
|
||||
class Duration {
|
||||
private:
|
||||
echrono::nanoseconds m_data;
|
||||
int64_t m_data; // stored in ns
|
||||
public:
|
||||
Duration();
|
||||
Duration(int _val); //value in nanosecond
|
||||
Duration(int64_t _val); //value in nanosecond
|
||||
Duration(int64_t _valSec, int64_t _valNano); //value in second and nanosecond
|
||||
Duration(int64_t _valSec, int32_t _valNano); //value in second and nanosecond
|
||||
Duration(double _val); //value in second
|
||||
Duration(echrono::nanoseconds _val);
|
||||
Duration(echrono::microseconds _val);
|
||||
Duration(echrono::milliseconds _val);
|
||||
Duration(echrono::seconds _val);
|
||||
template<int64_t ECHRONO_FACTOR>
|
||||
Duration(const genericOffsetTime<ECHRONO_FACTOR>& _val) {
|
||||
m_data = _val.get();
|
||||
}
|
||||
~Duration() { };
|
||||
int64_t count() const;
|
||||
const echrono::nanoseconds& get() const {
|
||||
int64_t get() const {
|
||||
return m_data;
|
||||
}
|
||||
const Duration& operator= (const Duration& _obj);
|
||||
@ -51,9 +65,9 @@ namespace echrono {
|
||||
Duration operator++(int _unused);
|
||||
Duration& operator--();
|
||||
Duration operator--(int _unused);
|
||||
float toSeconds() const;
|
||||
double toSeconds() const;
|
||||
void reset();
|
||||
};
|
||||
std::ostream& operator <<(std::ostream& _os, const echrono::Duration& _obj);
|
||||
etk::Stream& operator <<(etk::Stream& _os, const echrono::Duration& _obj);
|
||||
}
|
||||
|
||||
|
@ -1,33 +1,67 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
|
||||
#include <echrono/Steady.hpp>
|
||||
#include <echrono/Duration.hpp>
|
||||
#include <echrono/debug.hpp>
|
||||
#include <etk/UString.hpp>
|
||||
#include <time.h>
|
||||
#include <etk/typeInfo.hpp>
|
||||
ETK_DECLARE_TYPE(echrono::Steady);
|
||||
|
||||
echrono::Steady::Steady() {
|
||||
m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(0));
|
||||
static int64_t getTime() {
|
||||
#if defined(__TARGET_OS__Android)
|
||||
struct timevalnow;
|
||||
gettimeofday(&now, null);
|
||||
return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_usec)*1000LL;
|
||||
#elif defined(__TARGET_OS__Web) \
|
||||
|| defined(__TARGET_OS__Linux) \
|
||||
|| defined(__TARGET_OS__buildroot) \
|
||||
|| defined(__TARGET_OS__MacOs) \
|
||||
|| defined(__TARGET_OS__IOs)
|
||||
struct timespec now;
|
||||
#ifdef CLOCK_BOOTTIME
|
||||
int ret = clock_gettime(CLOCK_BOOTTIME, &now);
|
||||
#else
|
||||
int ret = clock_gettime(CLOCK_UPTIME_RAW, &now);
|
||||
#endif
|
||||
if (ret != 0) {
|
||||
// Error to get the time ...
|
||||
now.tv_sec = time(null);
|
||||
now.tv_nsec = 0;
|
||||
}
|
||||
return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_nsec);
|
||||
#else
|
||||
#error must be implemented ...
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
echrono::Steady::Steady() :
|
||||
m_data(0) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Steady::Steady(int64_t _valNano) {
|
||||
m_data = std::chrono::steady_clock::time_point(std::chrono::nanoseconds(_valNano));
|
||||
m_data = _valNano;
|
||||
}
|
||||
|
||||
echrono::Steady::Steady(int64_t _valSec, int64_t _valNano) {
|
||||
m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(_valSec));
|
||||
m_data += std::chrono::nanoseconds(_valNano);
|
||||
echrono::Steady::Steady(int64_t _valSec, int32_t _valNano) :
|
||||
m_data(_valSec*1000000000LL +_valNano) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Steady::Steady(const std::chrono::steady_clock::time_point& _val) {
|
||||
m_data = _val;
|
||||
echrono::Steady::Steady(const echrono::Steady& _obj) :
|
||||
m_data(_obj.m_data) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Steady echrono::Steady::now() {
|
||||
return echrono::Steady(std::chrono::steady_clock::now());
|
||||
return echrono::Steady(getTime());
|
||||
}
|
||||
|
||||
const echrono::Steady& echrono::Steady::operator= (const echrono::Steady& _obj) {
|
||||
@ -60,60 +94,41 @@ bool echrono::Steady::operator>= (const echrono::Steady& _obj) const {
|
||||
}
|
||||
|
||||
const echrono::Steady& echrono::Steady::operator+= (const echrono::Duration& _obj) {
|
||||
#if defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs)
|
||||
std::chrono::microseconds ms = std::chrono::duration_cast<std::chrono::microseconds>(_obj.get());
|
||||
m_data += ms;
|
||||
#else
|
||||
m_data += _obj.get();
|
||||
#endif
|
||||
m_data += _obj.get();
|
||||
return *this;
|
||||
}
|
||||
|
||||
echrono::Steady echrono::Steady::operator+ (const echrono::Duration& _obj) const {
|
||||
echrono::Steady time(m_data);
|
||||
time += _obj;
|
||||
return time;
|
||||
echrono::Steady tmp(m_data);
|
||||
tmp += _obj;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
const echrono::Steady& echrono::Steady::operator-= (const echrono::Duration& _obj) {
|
||||
#if defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs)
|
||||
std::chrono::microseconds ms = std::chrono::duration_cast<std::chrono::microseconds>(_obj.get());
|
||||
m_data -= ms;
|
||||
#else
|
||||
m_data -= _obj.get();
|
||||
#endif
|
||||
m_data -= _obj.get();
|
||||
return *this;
|
||||
}
|
||||
|
||||
echrono::Steady echrono::Steady::operator- (const echrono::Duration& _obj) const {
|
||||
echrono::Steady time(m_data);
|
||||
time -= _obj;
|
||||
return time;
|
||||
echrono::Steady tmp(m_data);
|
||||
tmp -= _obj;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
echrono::Duration echrono::Steady::operator- (const echrono::Steady& _obj) const {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(m_data.time_since_epoch());
|
||||
std::chrono::nanoseconds ns2 = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.m_data.time_since_epoch());
|
||||
echrono::Duration duration(ns);
|
||||
echrono::Duration duration2(ns2);
|
||||
return duration - duration2;
|
||||
return echrono::Duration(int64_t(m_data - _obj.m_data));
|
||||
}
|
||||
|
||||
void echrono::Steady::reset() {
|
||||
m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(0));
|
||||
m_data = 0;
|
||||
}
|
||||
|
||||
int64_t echrono::Steady::count() {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(m_data.time_since_epoch());
|
||||
return ns.count()/1000;
|
||||
}
|
||||
|
||||
std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Steady& _obj) {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
|
||||
int64_t totalSecond = ns.count()/1000000000;
|
||||
int64_t millisecond = (ns.count()%1000000000)/1000000;
|
||||
int64_t microsecond = (ns.count()%1000000)/1000;
|
||||
int64_t nanosecond = ns.count()%1000;
|
||||
etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Steady& _obj) {
|
||||
int64_t ns = _obj.get();
|
||||
int64_t totalSecond = ns/1000000000;
|
||||
int64_t millisecond = (ns%1000000000)/1000000;
|
||||
int64_t microsecond = (ns%1000000)/1000;
|
||||
int64_t nanosecond = ns%1000;
|
||||
//_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns";
|
||||
int32_t second = totalSecond % 60;
|
||||
int32_t minute = (totalSecond/60)%60;
|
||||
@ -154,14 +169,10 @@ std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Steady& _ob
|
||||
}
|
||||
|
||||
namespace etk {
|
||||
template<> std::string to_string<echrono::Steady>(const echrono::Steady& _obj) {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
|
||||
return etk::to_string(ns.count());
|
||||
template<> etk::String toString<echrono::Steady>(const echrono::Steady& _obj) {
|
||||
return etk::toString(_obj.get());
|
||||
}
|
||||
template<> etk::UString toUString<echrono::Steady>(const echrono::Steady& _obj) {
|
||||
return etk::toUString(_obj.get());
|
||||
}
|
||||
#if __CPP_VERSION__ >= 2011
|
||||
template<> std::u32string to_u32string<echrono::Steady>(const echrono::Steady& _obj) {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
|
||||
return etk::to_u32string(ns.count());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
@ -1,13 +1,12 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <etk/String.hpp>
|
||||
#include <etk/types.hpp>
|
||||
#include <chrono>
|
||||
|
||||
namespace echrono {
|
||||
class Duration;
|
||||
@ -16,22 +15,17 @@ namespace echrono {
|
||||
*/
|
||||
class Steady {
|
||||
private:
|
||||
std::chrono::steady_clock::time_point m_data;
|
||||
uint64_t m_data; //!< Monotonic clock since computer star (ns)
|
||||
public:
|
||||
Steady();
|
||||
//Steady(const echrono::Duration& _val) {}; //value in second
|
||||
Steady(int64_t _valNano);
|
||||
Steady(int64_t _valSec, int64_t _valNano);
|
||||
Steady(const std::chrono::steady_clock::time_point& _val);
|
||||
Steady(int64_t _valSec, int32_t _valNano);
|
||||
Steady(const echrono::Steady& _obj);
|
||||
~Steady() {};
|
||||
const std::chrono::steady_clock::time_point& get() const {
|
||||
int64_t get() const {
|
||||
return m_data;
|
||||
}
|
||||
/**
|
||||
* @brief return the number of us since start program (can be <0)
|
||||
* @return a number un us since start
|
||||
*/
|
||||
int64_t count();
|
||||
static Steady now();
|
||||
const Steady& operator= (const echrono::Steady& _obj );
|
||||
bool operator== (const echrono::Steady& _obj) const;
|
||||
@ -47,6 +41,9 @@ namespace echrono {
|
||||
Duration operator- (const echrono::Steady& _obj) const;
|
||||
void reset();
|
||||
};
|
||||
std::ostream& operator <<(std::ostream& _os, const echrono::Steady& _obj);
|
||||
etk::Stream& operator <<(etk::Stream& _os, const echrono::Steady& _obj);
|
||||
}
|
||||
|
||||
|
||||
#include <echrono/Duration.hpp>
|
||||
|
||||
|
129
echrono/Time.cpp
129
echrono/Time.cpp
@ -1,43 +1,66 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
|
||||
#include <echrono/Time.hpp>
|
||||
#include <echrono/Duration.hpp>
|
||||
#include <echrono/debug.hpp>
|
||||
|
||||
echrono::Time::Time() {
|
||||
m_data = std::chrono::system_clock::time_point(std::chrono::seconds(0));
|
||||
#include <etk/UString.hpp>
|
||||
#include <etk/stdTools.hpp>
|
||||
extern "C" {
|
||||
#include <time.h>
|
||||
}
|
||||
#include <etk/typeInfo.hpp>
|
||||
ETK_DECLARE_TYPE(echrono::Time);
|
||||
|
||||
echrono::Time::Time(int64_t _valNano) {
|
||||
#if defined(__TARGET_OS__MacOs) \
|
||||
or defined(__TARGET_OS__IOs)
|
||||
m_data = std::chrono::system_clock::time_point(std::chrono::milliseconds(_valNano/1000));
|
||||
static int64_t getTime() {
|
||||
#if defined(__TARGET_OS__Android)
|
||||
struct timevalnow;
|
||||
gettimeofday(&now, null);
|
||||
return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_usec)*1000LL;
|
||||
#elif defined(__TARGET_OS__Web) \
|
||||
|| defined(__TARGET_OS__Linux) \
|
||||
|| defined(__TARGET_OS__buildroot) \
|
||||
|| defined(__TARGET_OS__MacOs) \
|
||||
|| defined(__TARGET_OS__IOs)
|
||||
struct timespec now;
|
||||
int ret = clock_gettime(CLOCK_REALTIME, &now);
|
||||
if (ret != 0) {
|
||||
// Error to get the time ...
|
||||
now.tv_sec = time(null);
|
||||
now.tv_nsec = 0;
|
||||
}
|
||||
return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_nsec);
|
||||
#else
|
||||
m_data = std::chrono::system_clock::time_point(std::chrono::nanoseconds(_valNano));
|
||||
#error must be implemented ...
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
echrono::Time::Time(int64_t _valSec, int64_t _valNano) {
|
||||
m_data = std::chrono::system_clock::time_point(std::chrono::seconds(_valSec));
|
||||
#if defined(__TARGET_OS__MacOs) \
|
||||
or defined(__TARGET_OS__IOs)
|
||||
m_data += std::chrono::milliseconds(_valNano/1000);
|
||||
#else
|
||||
m_data += std::chrono::nanoseconds(_valNano);
|
||||
#endif
|
||||
echrono::Time::Time() :
|
||||
m_data(0) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Time::Time(const std::chrono::system_clock::time_point& _val) {
|
||||
m_data = _val;
|
||||
echrono::Time::Time(int64_t _valNano) :
|
||||
m_data(_valNano) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Time::Time(int64_t _valSec, int32_t _valNano) :
|
||||
m_data(_valSec*1000000000LL +_valNano) {
|
||||
|
||||
}
|
||||
|
||||
echrono::Time::Time(const echrono::Time& _val) {
|
||||
m_data = _val.m_data;
|
||||
}
|
||||
|
||||
echrono::Time echrono::Time::now() {
|
||||
return echrono::Time(std::chrono::system_clock::now());
|
||||
return echrono::Time(getTime());
|
||||
}
|
||||
|
||||
const echrono::Time& echrono::Time::operator= (const echrono::Time& _obj) {
|
||||
@ -70,66 +93,48 @@ bool echrono::Time::operator>= (const echrono::Time& _obj) const {
|
||||
}
|
||||
|
||||
const echrono::Time& echrono::Time::operator+= (const echrono::Duration& _obj) {
|
||||
#if defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs)
|
||||
std::chrono::microseconds ms = std::chrono::duration_cast<std::chrono::microseconds>(_obj.get());
|
||||
m_data += ms;
|
||||
#else
|
||||
m_data += _obj.get();
|
||||
#endif
|
||||
m_data += _obj.get();
|
||||
return *this;
|
||||
}
|
||||
|
||||
echrono::Time echrono::Time::operator+ (const echrono::Duration& _obj) const {
|
||||
echrono::Time time(m_data);
|
||||
time += _obj;
|
||||
return time;
|
||||
echrono::Time tmp(m_data);
|
||||
tmp += _obj.get();
|
||||
return tmp;
|
||||
}
|
||||
|
||||
const echrono::Time& echrono::Time::operator-= (const echrono::Duration& _obj) {
|
||||
#if defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs)
|
||||
std::chrono::microseconds ms = std::chrono::duration_cast<std::chrono::microseconds>(_obj.get());
|
||||
m_data -= ms;
|
||||
#else
|
||||
m_data -= _obj.get();
|
||||
#endif
|
||||
m_data -= _obj.get();
|
||||
return *this;
|
||||
}
|
||||
|
||||
echrono::Time echrono::Time::operator- (const echrono::Duration& _obj) const {
|
||||
echrono::Time time(m_data);
|
||||
time -= _obj;
|
||||
return time;
|
||||
echrono::Time tmp(m_data);
|
||||
tmp -= _obj.get();
|
||||
return tmp;
|
||||
}
|
||||
|
||||
echrono::Duration echrono::Time::operator- (const echrono::Time& _obj) const {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(m_data.time_since_epoch());
|
||||
std::chrono::nanoseconds ns2 = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.m_data.time_since_epoch());
|
||||
echrono::Duration duration(ns);
|
||||
echrono::Duration duration2(ns2);
|
||||
return duration - duration2;
|
||||
return echrono::Duration(int64_t(m_data - _obj.m_data));
|
||||
}
|
||||
|
||||
void echrono::Time::reset() {
|
||||
m_data = std::chrono::system_clock::time_point(std::chrono::seconds(0));
|
||||
m_data = 0;
|
||||
}
|
||||
|
||||
int64_t echrono::Time::count() {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(m_data.time_since_epoch());
|
||||
return ns.count()/1000;
|
||||
}
|
||||
|
||||
std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Time& _obj) {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
|
||||
int64_t totalSecond = ns.count()/1000000000;
|
||||
int64_t millisecond = (ns.count()%1000000000)/1000000;
|
||||
int64_t microsecond = (ns.count()%1000000)/1000;
|
||||
int64_t nanosecond = ns.count()%1000;
|
||||
etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Time& _obj) {
|
||||
int64_t ns = _obj.get();
|
||||
int64_t totalSecond = ns/1000000000;
|
||||
int64_t millisecond = (ns%1000000000)/1000000;
|
||||
int64_t microsecond = (ns%1000000)/1000;
|
||||
int64_t nanosecond = ns%1000;
|
||||
//_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns";
|
||||
int32_t second = totalSecond % 60;
|
||||
int32_t minute = (totalSecond/60)%60;
|
||||
int32_t hour = (totalSecond/3600)%24;
|
||||
int32_t day = (totalSecond/(24*3600))%365;
|
||||
int32_t year = totalSecond/(24*3600*365);
|
||||
int32_t year = totalSecond/(24*3600*365) + 1970;
|
||||
bool start = false;
|
||||
if (year != 0) {
|
||||
start = true;
|
||||
@ -165,15 +170,11 @@ std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Time& _obj)
|
||||
|
||||
|
||||
namespace etk {
|
||||
template<> std::string to_string<echrono::Time>(const echrono::Time& _obj) {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
|
||||
return etk::to_string(ns.count());
|
||||
template<> etk::String toString<echrono::Time>(const echrono::Time& _obj) {
|
||||
return etk::toString(_obj.get());
|
||||
}
|
||||
template<> etk::UString toUString<echrono::Time>(const echrono::Time& _obj) {
|
||||
return etk::toUString(_obj.get());
|
||||
}
|
||||
#if __CPP_VERSION__ >= 2011
|
||||
template<> std::u32string to_u32string<echrono::Time>(const echrono::Time& _obj) {
|
||||
std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
|
||||
return etk::to_u32string(ns.count());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -1,13 +1,12 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <etk/String.hpp>
|
||||
#include <etk/types.hpp>
|
||||
#include <chrono>
|
||||
|
||||
namespace echrono {
|
||||
class Duration;
|
||||
@ -16,22 +15,24 @@ namespace echrono {
|
||||
*/
|
||||
class Time {
|
||||
private:
|
||||
std::chrono::system_clock::time_point m_data;
|
||||
uint64_t m_data; //!< earth time since Epock in ns
|
||||
public:
|
||||
Time();
|
||||
//Time(const echrono::Duration& _val) {}; //value in second
|
||||
Time(int64_t _valNano);
|
||||
Time(int64_t _valSec, int64_t _valNano);
|
||||
Time(const std::chrono::system_clock::time_point& _val);
|
||||
Time(int64_t _valSec, int32_t _valNano);
|
||||
Time(const echrono::Time& _val);
|
||||
~Time() {};
|
||||
const std::chrono::system_clock::time_point& get() const {
|
||||
int64_t get() const {
|
||||
return m_data;
|
||||
}
|
||||
/**
|
||||
* @brief return the number od us since epoch (can be <0)
|
||||
* @return a number un µs since epoch
|
||||
* @return a number in us since epoch
|
||||
*/
|
||||
int64_t count();
|
||||
int64_t count() {
|
||||
return get()/1000;
|
||||
}
|
||||
/**
|
||||
* @brief get the current time
|
||||
*/
|
||||
@ -50,6 +51,7 @@ namespace echrono {
|
||||
Duration operator- (const echrono::Time& _obj) const;
|
||||
void reset();
|
||||
};
|
||||
std::ostream& operator <<(std::ostream& _os, const echrono::Time& _obj);
|
||||
etk::Stream& operator <<(etk::Stream& _os, const echrono::Time& _obj);
|
||||
}
|
||||
|
||||
#include <echrono/Duration.hpp>
|
||||
|
@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include <echrono/debug.hpp>
|
||||
|
@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include <echrono/debug.hpp>
|
||||
@ -17,11 +17,11 @@ void echrono::init(int _argc, const char** _argv) {
|
||||
}
|
||||
ECHRONO_INFO("E-chrono system init");
|
||||
for (int32_t iii=0; iii<_argc ; ++iii) {
|
||||
std::string data = _argv[iii];
|
||||
etk::String data = _argv[iii];
|
||||
if ( data == "-h"
|
||||
|| data == "--help") {
|
||||
ECHRONO_PRINT("e-chrono - help : ");
|
||||
ECHRONO_PRINT(" -h/--help: Dispplay this help");
|
||||
ECHRONO_PRINT(" -h/--help: Display this help");
|
||||
} else if (etk::start_with(data, "--echrono") == true) {
|
||||
ECHRONO_ERROR("Can not parse the argument : '" << data << "'");
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2016, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/python
|
||||
import lutin.debug as debug
|
||||
import realog.debug as debug
|
||||
import lutin.tools as tools
|
||||
|
||||
|
||||
@ -7,10 +7,10 @@ def get_type():
|
||||
return "LIBRARY"
|
||||
|
||||
def get_desc():
|
||||
return "E-chrono: Ewol chrono wrapper to simplify use of std::chrono (and permit to create a virtual clock)"
|
||||
return "E-chrono: Ewol chrono"
|
||||
|
||||
def get_licence():
|
||||
return "APACHE-2"
|
||||
return "MPL-2"
|
||||
|
||||
def get_compagny_type():
|
||||
return "com"
|
||||
@ -47,7 +47,7 @@ def configure(target, my_module):
|
||||
# name of the dependency
|
||||
my_module.add_depend([
|
||||
'elog',
|
||||
'etk',
|
||||
'etk-core',
|
||||
])
|
||||
|
||||
my_module.add_path(".")
|
||||
|
@ -1 +1 @@
|
||||
0.1.0
|
||||
1.0.0
|
Loading…
x
Reference in New Issue
Block a user