atria-soft/echrono
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: atria-soft:main
Branches Tags
atria-soft:main
atria-soft:dev
atria-soft:gh-pages
atria-soft:v1.0.0
atria-soft:0.1.0
..
compare: atria-soft:0.1.0
Branches Tags
atria-soft:dev
atria-soft:main
atria-soft:gh-pages
atria-soft:v1.0.0
atria-soft:0.1.0

No commits in common. "main" and "0.1.0" have entirely different histories.
main ... 0.1.0

17 changed files with 505 additions and 673 deletions
Show Stats Expand all files Collapse all files

4
.gitignore vendored
View File

@ -27,7 +27,3 @@
*.exe *.exe
*.out *.out
*.app *.app
# python property:
*.pyc
__pycache__/

574
LICENSE
View File

@ -1,373 +1,201 @@
Mozilla Public License Version 2.0 Apache License
================================== Version 2.0, January 2004
http://www.apache.org/licenses/
1. Definitions
-------------- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1.1. "Contributor" 1. Definitions.
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 "Licensor" shall mean the copyright owner or entity authorized by
by a Contributor and that particular Contributor's Contribution. the copyright owner that is granting the License.
1.3. "Contribution" "Legal Entity" shall mean the union of the acting entity and all
means Covered Software of a particular Contributor. other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
1.4. "Covered Software" "control" means (i) the power, direct or indirect, to cause the
means Source Code Form to which the initial Contributor has attached direction or management of such entity, whether by contract or
the notice in Exhibit A, the Executable Form of such Source Code otherwise, or (ii) ownership of fifty percent (50%) or more of the
Form, and Modifications of such Source Code Form, in each case outstanding shares, or (iii) beneficial ownership of such entity.
including portions thereof.
"You" (or "Your") shall mean an individual or Legal Entity
1.5. "Incompatible With Secondary Licenses" exercising permissions granted by this License.
means
"Source" form shall mean the preferred form for making modifications,
(a) that the initial Contributor has attached the notice described including but not limited to software source code, documentation
in Exhibit B to the Covered Software; or source, and configuration files.
(b) that the Covered Software was made available under the terms of "Object" form shall mean any form resulting from mechanical
version 1.1 or earlier of the License, but not also under the transformation or translation of a Source form, including but
terms of a Secondary License. not limited to compiled object code, generated documentation,
and conversions to other media types.
1.6. "Executable Form"
means any form of the work other than Source Code Form. "Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
1.7. "Larger Work" copyright notice that is included in or attached to the work
means a work that combines Covered Software with other material, in (an example is provided in the Appendix below).
a separate file or files, that is not Covered Software.
"Derivative Works" shall mean any work, whether in Source or Object
1.8. "License" form, that is based on (or derived from) the Work and for which the
means this document. editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
1.9. "Licensable" of this License, Derivative Works shall not include works that remain
means having the right to grant, to the maximum extent possible, separable from, or merely link (or bind by name) to the interfaces of,
whether at the time of the initial grant or subsequently, any and the Work and Derivative Works thereof.
all of the rights conveyed by this License.
"Contribution" shall mean any work of authorship, including
1.10. "Modifications" the original version of the Work and any modifications or additions
means any of the following: to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
(a) any file in Source Code Form that results from an addition to, or by an individual or Legal Entity authorized to submit on behalf of
deletion from, or modification of the contents of Covered the copyright owner. For the purposes of this definition, "submitted"
Software; or means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
(b) any new file in Source Code Form that contains any Covered communication on electronic mailing lists, source code control systems,
Software. and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
1.11. "Patent Claims" of a Contributor excluding communication that is conspicuously marked or otherwise
means any patent claim(s), including without limitation, method, designated in writing by the copyright owner as "Not a Contribution."
process, and apparatus claims, in any patent Licensable by such
Contributor that would be infringed, but for the grant of the "Contributor" shall mean Licensor and any individual or Legal Entity
License, by the making, using, selling, offering for sale, having on behalf of whom a Contribution has been received by Licensor and
made, import, or transfer of either its Contributions or its subsequently incorporated within the Work.
Contributor Version.
2. Grant of Copyright License. Subject to the terms and conditions of
1.12. "Secondary License" this License, each Contributor hereby grants to You a perpetual,
means either the GNU General Public License, Version 2.0, the GNU worldwide, non-exclusive, no-charge, royalty-free, irrevocable
Lesser General Public License, Version 2.1, the GNU Affero General copyright license to reproduce, prepare Derivative Works of,
Public License, Version 3.0, or any later versions of those publicly display, publicly perform, sublicense, and distribute the
licenses. Work and such Derivative Works in Source or Object form.
1.13. "Source Code Form" 3. Grant of Patent License. Subject to the terms and conditions of
means the form of the work preferred for making modifications. this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
1.14. "You" (or "Your") (except as stated in this section) patent license to make, have made,
means an individual or a legal entity exercising rights under this use, offer to sell, sell, import, and otherwise transfer the Work,
License. For legal entities, "You" includes any entity that where such license applies only to those patent claims licensable
controls, is controlled by, or is under common control with You. For by such Contributor that are necessarily infringed by their
purposes of this definition, "control" means (a) the power, direct Contribution(s) alone or by combination of their Contribution(s)
or indirect, to cause the direction or management of such entity, with the Work to which such Contribution(s) was submitted. If You
whether by contract or otherwise, or (b) ownership of more than institute patent litigation against any entity (including a
fifty percent (50%) of the outstanding shares or beneficial cross-claim or counterclaim in a lawsuit) alleging that the Work
ownership of such entity. or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
2. License Grants and Conditions granted to You under this License for that Work shall terminate
-------------------------------- as of the date such litigation is filed.
2.1. Grants 4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
Each Contributor hereby grants You a world-wide, royalty-free, modifications, and in Source or Object form, provided that You
non-exclusive license: meet the following conditions:
(a) under intellectual property rights (other than patent or trademark) (a) You must give any other recipients of the Work or
Licensable by such Contributor to use, reproduce, make available, Derivative Works a copy of this License; and
modify, display, perform, distribute, and otherwise exploit its
Contributions, either on an unmodified basis, with Modifications, or (b) You must cause any modified files to carry prominent notices
as part of a Larger Work; and stating that You changed the files; and
(b) under Patent Claims of such Contributor to make, use, sell, offer (c) You must retain, in the Source form of any Derivative Works
for sale, have made, import, and otherwise transfer either its that You distribute, all copyright, patent, trademark, and
Contributions or its Contributor Version. attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
2.2. Effective Date the Derivative Works; and
The licenses granted in Section 2.1 with respect to any Contribution (d) If the Work includes a "NOTICE" text file as part of its
become effective for each Contribution on the date the Contributor first distribution, then any Derivative Works that You distribute must
distributes such Contribution. include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
2.3. Limitations on Grant Scope pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
The licenses granted in this Section 2 are the only rights granted under as part of the Derivative Works; within the Source form or
this License. No additional rights or licenses will be implied from the documentation, if provided along with the Derivative Works; or,
distribution or licensing of Covered Software under this License. within a display generated by the Derivative Works, if and
Notwithstanding Section 2.1(b) above, no patent license is granted by a wherever such third-party notices normally appear. The contents
Contributor: of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
(a) for any code that a Contributor has removed from Covered Software; notices within Derivative Works that You distribute, alongside
or or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
(b) for infringements caused by: (i) Your and any other third party's as modifying the License.
modifications of Covered Software, or (ii) the combination of its
Contributions with other software (except as part of its Contributor You may add Your own copyright statement to Your modifications and
Version); or may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
(c) under Patent Claims infringed by Covered Software in the absence of for any such Derivative Works as a whole, provided Your use,
its Contributions. reproduction, and distribution of the Work otherwise complies with
the conditions stated in this 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 5. Submission of Contributions. Unless You explicitly state otherwise,
the notice requirements in Section 3.4). any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
2.4. Subsequent Licenses this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
No Contributor makes additional grants as a result of Your choice to the terms of any separate license agreement you may have executed
distribute the Covered Software under a subsequent version of this with Licensor regarding such Contributions.
License (see Section 10.2) or under the terms of a Secondary License (if
permitted under the terms of Section 3.3). 6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
2.5. Representation 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 represents that the Contributor believes its
Contributions are its original creation(s) or it has sufficient rights 7. Disclaimer of Warranty. Unless required by applicable law or
to grant the rights to its Contributions conveyed by this License. agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
2.6. Fair Use WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
This License is not intended to limit any rights You have under of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
applicable copyright doctrines of fair use, fair dealing, or other PARTICULAR PURPOSE. You are solely responsible for determining the
equivalents. appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
2.7. Conditions
8. Limitation of Liability. In no event and under no legal theory,
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted whether in tort (including negligence), contract, or otherwise,
in Section 2.1. unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
3. Responsibilities 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
3.1. Distribution of Source Form Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
All distribution of Covered Software in Source Code Form, including any other commercial damages or losses), even if such Contributor
Modifications that You create or to which You contribute, must be under has been advised of the possibility of such damages.
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 9. Accepting Warranty or Additional Liability. While redistributing
License, and how they can obtain a copy of this License. You may not the Work or Derivative Works thereof, You may choose to offer,
attempt to alter or restrict the recipients' rights in the Source Code and charge a fee for, acceptance of support, warranty, indemnity,
Form. or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
3.2. Distribution of Executable Form on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
If You distribute Covered Software in Executable Form then: defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
(a) such Covered Software must also be made available in Source Code of your accepting any such warranty or additional liability.
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 END OF TERMS AND CONDITIONS
Form by reasonable means in a timely manner, at a charge no more
than the cost of distribution to the recipient; and APPENDIX: How to apply the Apache License to your work.
(b) You may distribute such Executable Form under the terms of this To apply the Apache License to your work, attach the following
License, or sublicense it under different terms, provided that the boilerplate notice, with the fields enclosed by brackets "{}"
license for the Executable Form does not attempt to limit or alter replaced with your own identifying information. (Don't include
the recipients' rights in the Source Code Form under this License. the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
3.3. Distribution of a Larger Work file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
You may create and distribute a Larger Work under terms of Your choice, identification within third-party archives.
provided that You also comply with the requirements of this License for
the Covered Software. If the Larger Work is a combination of Covered Copyright {yyyy} {name of copyright owner}
Software with a work governed by one or more Secondary Licenses, and the
Covered Software is not Incompatible With Secondary Licenses, this Licensed under the Apache License, Version 2.0 (the "License");
License permits You to additionally distribute such Covered Software you may not use this file except in compliance with the License.
under the terms of such Secondary License(s), so that the recipient of You may obtain a copy of the License at
the Larger Work may, at their option, further distribute the Covered
Software under the terms of either this License or such Secondary http://www.apache.org/licenses/LICENSE-2.0
License(s).
Unless required by applicable law or agreed to in writing, software
3.4. Notices distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
You may not remove or alter the substance of any license notices See the License for the specific language governing permissions and
(including copyright notices, patent notices, disclaimers of warranty, limitations under the License.
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.

8
README.md
View File

@ -1,7 +1,7 @@
e-chrono e-chrono
======== ========
`e-chrono` time interface (wrapped multi-os) `e-chrono` Virualize the std::chono interface to permit to have a slow virtual clock
Release (master) Release (master)
---------------- ----------------
@ -60,15 +60,15 @@ Compile software:
lutin -C -P echrono lutin -C -P echrono
License (MPL v2.0) License (APACHE v2.0)
===================== =====================
Copyright echrono Edouard DUPIN Copyright echrono Edouard DUPIN
Licensed under the Mozilla Public License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
https://www.mozilla.org/MPL/2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,

95
echrono/Clock.cpp
View File

@ -1,7 +1,7 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
@ -9,29 +9,21 @@
#include <echrono/Steady.hpp> #include <echrono/Steady.hpp>
#include <echrono/Duration.hpp> #include <echrono/Duration.hpp>
#include <echrono/debug.hpp> #include <echrono/debug.hpp>
#include <etk/UString.hpp>
#include <etk/typeInfo.hpp> echrono::Clock::Clock() {
ETK_DECLARE_TYPE(echrono::Clock); m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(0));
echrono::Clock::Clock() :
m_data(0) {
} }
echrono::Clock::Clock(int64_t _valNano) : echrono::Clock::Clock(int64_t _valNano) {
m_data(_valNano) { m_data = std::chrono::steady_clock::time_point(std::chrono::nanoseconds(_valNano));
} }
echrono::Clock::Clock(int64_t _valSec, int32_t _valNano) : echrono::Clock::Clock(int64_t _valSec, int64_t _valNano) {
m_data(_valSec*1000000000LL +_valNano) { m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(_valSec));
m_data += std::chrono::nanoseconds(_valNano);
} }
echrono::Clock::Clock(const std::chrono::steady_clock::time_point& _val) {
echrono::Clock::Clock(const echrono::Clock& _val): m_data = _val;
m_data(_val.m_data) {
} }
echrono::Clock::Clock(const echrono::Steady& _val) { echrono::Clock::Clock(const echrono::Steady& _val) {
@ -39,7 +31,7 @@ echrono::Clock::Clock(const echrono::Steady& _val) {
} }
echrono::Clock echrono::Clock::now() { echrono::Clock echrono::Clock::now() {
return echrono::Clock(echrono::Steady::now()); return echrono::Clock(std::chrono::steady_clock::now());
} }
const echrono::Clock& echrono::Clock::operator= (const echrono::Clock& _obj) { const echrono::Clock& echrono::Clock::operator= (const echrono::Clock& _obj) {
@ -72,41 +64,60 @@ bool echrono::Clock::operator>= (const echrono::Clock& _obj) const {
} }
const echrono::Clock& echrono::Clock::operator+= (const echrono::Duration& _obj) { const echrono::Clock& echrono::Clock::operator+= (const echrono::Duration& _obj) {
m_data += _obj.get(); #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
return *this; return *this;
} }
echrono::Clock echrono::Clock::operator+ (const echrono::Duration& _obj) const { echrono::Clock echrono::Clock::operator+ (const echrono::Duration& _obj) const {
echrono::Clock tmp(m_data); echrono::Clock time(m_data);
tmp += _obj; time += _obj;
return tmp; return time;
} }
const echrono::Clock& echrono::Clock::operator-= (const echrono::Duration& _obj) { const echrono::Clock& echrono::Clock::operator-= (const echrono::Duration& _obj) {
m_data -= _obj.get(); #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
return *this; return *this;
} }
echrono::Clock echrono::Clock::operator- (const echrono::Duration& _obj) const { echrono::Clock echrono::Clock::operator- (const echrono::Duration& _obj) const {
echrono::Clock tmp(m_data); echrono::Clock time(m_data);
tmp -= _obj; time -= _obj;
return tmp; return time;
} }
echrono::Duration echrono::Clock::operator- (const echrono::Clock& _obj) const { echrono::Duration echrono::Clock::operator- (const echrono::Clock& _obj) const {
return echrono::Duration(int64_t(m_data - _obj.m_data)); 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;
} }
void echrono::Clock::reset() { void echrono::Clock::reset() {
m_data = 0; m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(0));
} }
etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Clock& _obj) { int64_t echrono::Clock::count() {
int64_t ns = _obj.get(); std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(m_data.time_since_epoch());
int64_t totalSecond = ns/1000000000; return ns.count()/1000;
int64_t millisecond = (ns%1000000000)/1000000; }
int64_t microsecond = (ns%1000000)/1000;
int64_t nanosecond = ns%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;
//_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns"; //_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns";
int32_t second = totalSecond % 60; int32_t second = totalSecond % 60;
int32_t minute = (totalSecond/60)%60; int32_t minute = (totalSecond/60)%60;
@ -148,10 +159,14 @@ etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Clock& _obj)
namespace etk { namespace etk {
template<> etk::String toString<echrono::Clock>(const echrono::Clock& _obj) { template<> std::string to_string<echrono::Clock>(const echrono::Clock& _obj) {
return etk::toString(_obj.get()); std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
} return etk::to_string(ns.count());
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
} }

18
echrono/Clock.hpp
View File

@ -1,12 +1,13 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once
#include <etk/String.hpp> #include <string>
#include <etk/types.hpp> #include <etk/types.hpp>
#include <chrono>
namespace echrono { namespace echrono {
class Duration; class Duration;
@ -16,22 +17,23 @@ namespace echrono {
*/ */
class Clock { class Clock {
private: private:
int64_t m_data; // stored in ns std::chrono::steady_clock::time_point m_data;
public: public:
Clock(); Clock();
//Clock(const echrono::Duration& _val) {}; //value in second //Clock(const echrono::Duration& _val) {}; //value in second
Clock(int64_t _valNano); Clock(int64_t _valNano);
Clock(int64_t _valSec, int32_t _valNano); Clock(int64_t _valSec, int64_t _valNano);
Clock(const echrono::Clock& _val); Clock(const std::chrono::steady_clock::time_point& _val);
Clock(const echrono::Steady& _val); Clock(const echrono::Steady& _val);
~Clock() {}; ~Clock() {};
int64_t get() const { const std::chrono::steady_clock::time_point& get() const {
return m_data; return m_data;
} }
/** /**
* @brief return the number of us since start of clock (can be <0) * @brief return the number of us since start of clock (can be <0)
* @return a number un us since start of clock * @return a number un us since start of clock
*/ */
int64_t count();
static Clock now(); static Clock now();
const Clock& operator= (const echrono::Clock& _obj ); const Clock& operator= (const echrono::Clock& _obj );
bool operator== (const echrono::Clock& _obj) const; bool operator== (const echrono::Clock& _obj) const;
@ -47,8 +49,6 @@ namespace echrono {
Duration operator- (const echrono::Clock& _obj) const; Duration operator- (const echrono::Clock& _obj) const;
void reset(); void reset();
}; };
etk::Stream& operator <<(etk::Stream& _os, const echrono::Clock& _obj); std::ostream& operator <<(std::ostream& _os, const echrono::Clock& _obj);
} }
#include <echrono/Duration.hpp>

116
echrono/Duration.cpp
View File

@ -1,40 +1,54 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <echrono/Time.hpp> #include <echrono/Time.hpp>
#include <echrono/Duration.hpp> #include <echrono/Duration.hpp>
#include <echrono/debug.hpp> #include <echrono/debug.hpp>
#include <etk/UString.hpp>
#include <etk/typeInfo.hpp> echrono::Duration::Duration() {
ETK_DECLARE_TYPE(echrono::Duration); m_data = std::chrono::nanoseconds(0);
echrono::Duration::Duration() :
m_data(0) {
} }
echrono::Duration::Duration(int _val) : echrono::Duration::Duration(int _val) {
m_data(_val) { m_data = std::chrono::nanoseconds(_val);
} }
echrono::Duration::Duration(int64_t _valSec, int32_t _valNano) : echrono::Duration::Duration(int64_t _valSec, int64_t _valNano) {
m_data(_valSec*1000000000LL +_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 _val) : echrono::Duration::Duration(int64_t _val) {
m_data(_val) { m_data = std::chrono::nanoseconds(_val);
} }
echrono::Duration::Duration(double _val) { echrono::Duration::Duration(double _val) {
m_data = int64_t(_val*1000000000.0); 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();
} }
const echrono::Duration& echrono::Duration::operator= (const echrono::Duration& _obj) { const echrono::Duration& echrono::Duration::operator= (const echrono::Duration& _obj) {
@ -60,25 +74,27 @@ bool echrono::Duration::operator>= (const echrono::Duration& _obj) const {
return m_data >= _obj.m_data; return m_data >= _obj.m_data;
} }
double echrono::Duration::toSeconds() const { float echrono::Duration::toSeconds() const {
return double(m_data) * 0.000000001; return float(double(m_data.count()) * 0.000000001);
} }
const echrono::Duration& echrono::Duration::operator/= (float _value) { const echrono::Duration& echrono::Duration::operator/= (float _value) {
m_data = int64_t(double(m_data) / _value); m_data = std::chrono::nanoseconds(int64_t(double(m_data.count()) / _value));
return *this; return *this;
} }
echrono::Duration echrono::Duration::operator/ (float _value) const { echrono::Duration echrono::Duration::operator/ (float _value) const {
return echrono::Duration(int64_t(double(m_data) / _value)); echrono::Duration tmpp(int64_t(double(m_data.count()) / _value));
return tmpp;
} }
const echrono::Duration& echrono::Duration::operator*= (float _value) { const echrono::Duration& echrono::Duration::operator*= (float _value) {
m_data = int64_t(double(m_data) * _value); m_data = std::chrono::nanoseconds(int64_t(double(m_data.count()) * _value));
return *this; return *this;
} }
echrono::Duration echrono::Duration::operator* (float _value) const { echrono::Duration echrono::Duration::operator* (float _value) const {
return echrono::Duration(int64_t(double(m_data) * _value)); echrono::Duration tmpp(int64_t(double(m_data.count()) * _value));
return tmpp;
} }
const echrono::Duration& echrono::Duration::operator+= (const echrono::Duration& _obj) { const echrono::Duration& echrono::Duration::operator+= (const echrono::Duration& _obj) {
@ -86,9 +102,9 @@ const echrono::Duration& echrono::Duration::operator+= (const echrono::Duration&
return *this; return *this;
} }
echrono::Duration echrono::Duration::operator+ (const echrono::Duration& _obj) const { echrono::Duration echrono::Duration::operator+ (const echrono::Duration& _obj) const {
echrono::Duration tmp(m_data); echrono::Duration tmpp(m_data);
tmp.m_data += _obj.m_data; tmpp.m_data += _obj.m_data;
return tmp; return tmpp;
} }
const echrono::Duration& echrono::Duration::operator-= (const echrono::Duration& _obj) { const echrono::Duration& echrono::Duration::operator-= (const echrono::Duration& _obj) {
@ -96,39 +112,39 @@ const echrono::Duration& echrono::Duration::operator-= (const echrono::Duration&
return *this; return *this;
} }
echrono::Duration echrono::Duration::operator- (const echrono::Duration& _obj) const { echrono::Duration echrono::Duration::operator- (const echrono::Duration& _obj) const {
echrono::Duration tmp(m_data); echrono::Duration tmpp(m_data);
tmp.m_data -= _obj.m_data; tmpp.m_data -= _obj.m_data;
return tmp; return tmpp;
} }
echrono::Duration& echrono::Duration::operator++() { echrono::Duration& echrono::Duration::operator++() {
m_data++; m_data += std::chrono::nanoseconds(1);
return *this; return *this;
} }
echrono::Duration echrono::Duration::operator++(int _unused) { echrono::Duration echrono::Duration::operator++(int _unused) {
echrono::Duration tmp(m_data); echrono::Duration result(m_data);
m_data++; m_data += std::chrono::nanoseconds(1);
return tmp; return result;
} }
echrono::Duration& echrono::Duration::operator--() { echrono::Duration& echrono::Duration::operator--() {
m_data -= 1; m_data -= std::chrono::nanoseconds(1);
return *this; return *this;
} }
echrono::Duration echrono::Duration::operator--(int _unused) { echrono::Duration echrono::Duration::operator--(int _unused) {
echrono::Duration tmp(m_data); m_data -= std::chrono::nanoseconds(1);
m_data--; echrono::Duration result(m_data);
return tmp; return result;
} }
void echrono::Duration::reset() { void echrono::Duration::reset() {
m_data = 0; m_data = std::chrono::nanoseconds(0);
} }
etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Duration& _obj) { std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Duration& _obj) {
int64_t totalSecond = _obj.get()/1000000000; int64_t totalSecond = _obj.count()/1000000000;
int64_t millisecond = (_obj.get()%1000000000)/1000000; int64_t millisecond = (_obj.count()%1000000000)/1000000;
int64_t microsecond = (_obj.get()%1000000)/1000; int64_t microsecond = (_obj.count()%1000000)/1000;
int64_t nanosecond = _obj.get()%1000; int64_t nanosecond = _obj.count()%1000;
//_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns"; //_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns";
int32_t second = totalSecond % 60; int32_t second = totalSecond % 60;
int32_t minute = (totalSecond/60)%60; int32_t minute = (totalSecond/60)%60;
@ -169,12 +185,14 @@ etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Duration& _ob
} }
namespace etk { namespace etk {
template<> etk::String toString<echrono::Duration>(const echrono::Duration& _obj) { template<> std::string to_string<echrono::Duration>(const echrono::Duration& _obj) {
return etk::toString(_obj.get()); return etk::to_string(_obj.count());
}
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
} }

46
echrono/Duration.hpp
View File

@ -1,49 +1,35 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once
#include <etk/types.hpp> #include <etk/types.hpp>
#include <chrono>
namespace echrono { namespace echrono {
template<int64_t ECHRONO_FACTOR> using nanoseconds = std::chrono::nanoseconds;
class genericOffsetTime { using microseconds = std::chrono::microseconds;
private: using milliseconds = std::chrono::milliseconds;
int64_t m_duration; using seconds = std::chrono::seconds;
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 { class Duration {
private: private:
int64_t m_data; // stored in ns echrono::nanoseconds m_data;
public: public:
Duration(); Duration();
Duration(int _val); //value in nanosecond Duration(int _val); //value in nanosecond
Duration(int64_t _val); //value in nanosecond Duration(int64_t _val); //value in nanosecond
Duration(int64_t _valSec, int32_t _valNano); //value in second and nanosecond Duration(int64_t _valSec, int64_t _valNano); //value in second and nanosecond
Duration(double _val); //value in second Duration(double _val); //value in second
template<int64_t ECHRONO_FACTOR> Duration(echrono::nanoseconds _val);
Duration(const genericOffsetTime<ECHRONO_FACTOR>& _val) { Duration(echrono::microseconds _val);
m_data = _val.get(); Duration(echrono::milliseconds _val);
} Duration(echrono::seconds _val);
~Duration() { }; ~Duration() { };
int64_t get() const { int64_t count() const;
const echrono::nanoseconds& get() const {
return m_data; return m_data;
} }
const Duration& operator= (const Duration& _obj); const Duration& operator= (const Duration& _obj);
@ -65,9 +51,9 @@ namespace echrono {
Duration operator++(int _unused); Duration operator++(int _unused);
Duration& operator--(); Duration& operator--();
Duration operator--(int _unused); Duration operator--(int _unused);
double toSeconds() const; float toSeconds() const;
void reset(); void reset();
}; };
etk::Stream& operator <<(etk::Stream& _os, const echrono::Duration& _obj); std::ostream& operator <<(std::ostream& _os, const echrono::Duration& _obj);
} }

119
echrono/Steady.cpp
View File

@ -1,67 +1,33 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <echrono/Steady.hpp> #include <echrono/Steady.hpp>
#include <echrono/Duration.hpp> #include <echrono/Duration.hpp>
#include <echrono/debug.hpp> #include <echrono/debug.hpp>
#include <etk/UString.hpp>
#include <time.h>
#include <etk/typeInfo.hpp>
ETK_DECLARE_TYPE(echrono::Steady);
static int64_t getTime() { echrono::Steady::Steady() {
#if defined(__TARGET_OS__Android) m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(0));
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) { echrono::Steady::Steady(int64_t _valNano) {
m_data = _valNano; m_data = std::chrono::steady_clock::time_point(std::chrono::nanoseconds(_valNano));
} }
echrono::Steady::Steady(int64_t _valSec, int32_t _valNano) : echrono::Steady::Steady(int64_t _valSec, int64_t _valNano) {
m_data(_valSec*1000000000LL +_valNano) { m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(_valSec));
m_data += std::chrono::nanoseconds(_valNano);
} }
echrono::Steady::Steady(const echrono::Steady& _obj) : echrono::Steady::Steady(const std::chrono::steady_clock::time_point& _val) {
m_data(_obj.m_data) { m_data = _val;
} }
echrono::Steady echrono::Steady::now() { echrono::Steady echrono::Steady::now() {
return echrono::Steady(getTime()); return echrono::Steady(std::chrono::steady_clock::now());
} }
const echrono::Steady& echrono::Steady::operator= (const echrono::Steady& _obj) { const echrono::Steady& echrono::Steady::operator= (const echrono::Steady& _obj) {
@ -94,41 +60,60 @@ bool echrono::Steady::operator>= (const echrono::Steady& _obj) const {
} }
const echrono::Steady& echrono::Steady::operator+= (const echrono::Duration& _obj) { const echrono::Steady& echrono::Steady::operator+= (const echrono::Duration& _obj) {
m_data += _obj.get(); #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
return *this; return *this;
} }
echrono::Steady echrono::Steady::operator+ (const echrono::Duration& _obj) const { echrono::Steady echrono::Steady::operator+ (const echrono::Duration& _obj) const {
echrono::Steady tmp(m_data); echrono::Steady time(m_data);
tmp += _obj; time += _obj;
return tmp; return time;
} }
const echrono::Steady& echrono::Steady::operator-= (const echrono::Duration& _obj) { const echrono::Steady& echrono::Steady::operator-= (const echrono::Duration& _obj) {
m_data -= _obj.get(); #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
return *this; return *this;
} }
echrono::Steady echrono::Steady::operator- (const echrono::Duration& _obj) const { echrono::Steady echrono::Steady::operator- (const echrono::Duration& _obj) const {
echrono::Steady tmp(m_data); echrono::Steady time(m_data);
tmp -= _obj; time -= _obj;
return tmp; return time;
} }
echrono::Duration echrono::Steady::operator- (const echrono::Steady& _obj) const { echrono::Duration echrono::Steady::operator- (const echrono::Steady& _obj) const {
return echrono::Duration(int64_t(m_data - _obj.m_data)); 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;
} }
void echrono::Steady::reset() { void echrono::Steady::reset() {
m_data = 0; m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(0));
} }
etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Steady& _obj) { int64_t echrono::Steady::count() {
int64_t ns = _obj.get(); std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(m_data.time_since_epoch());
int64_t totalSecond = ns/1000000000; return ns.count()/1000;
int64_t millisecond = (ns%1000000000)/1000000; }
int64_t microsecond = (ns%1000000)/1000;
int64_t nanosecond = ns%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;
//_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns"; //_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns";
int32_t second = totalSecond % 60; int32_t second = totalSecond % 60;
int32_t minute = (totalSecond/60)%60; int32_t minute = (totalSecond/60)%60;
@ -169,10 +154,14 @@ etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Steady& _obj)
} }
namespace etk { namespace etk {
template<> etk::String toString<echrono::Steady>(const echrono::Steady& _obj) { template<> std::string to_string<echrono::Steady>(const echrono::Steady& _obj) {
return etk::toString(_obj.get()); std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
} return etk::to_string(ns.count());
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
} }

23
echrono/Steady.hpp
View File

@ -1,12 +1,13 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once
#include <etk/String.hpp> #include <string>
#include <etk/types.hpp> #include <etk/types.hpp>
#include <chrono>
namespace echrono { namespace echrono {
class Duration; class Duration;
@ -15,17 +16,22 @@ namespace echrono {
*/ */
class Steady { class Steady {
private: private:
uint64_t m_data; //!< Monotonic clock since computer star (ns) std::chrono::steady_clock::time_point m_data;
public: public:
Steady(); Steady();
//Steady(const echrono::Duration& _val) {}; //value in second //Steady(const echrono::Duration& _val) {}; //value in second
Steady(int64_t _valNano); Steady(int64_t _valNano);
Steady(int64_t _valSec, int32_t _valNano); Steady(int64_t _valSec, int64_t _valNano);
Steady(const echrono::Steady& _obj); Steady(const std::chrono::steady_clock::time_point& _val);
~Steady() {}; ~Steady() {};
int64_t get() const { const std::chrono::steady_clock::time_point& get() const {
return m_data; 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(); static Steady now();
const Steady& operator= (const echrono::Steady& _obj ); const Steady& operator= (const echrono::Steady& _obj );
bool operator== (const echrono::Steady& _obj) const; bool operator== (const echrono::Steady& _obj) const;
@ -41,9 +47,6 @@ namespace echrono {
Duration operator- (const echrono::Steady& _obj) const; Duration operator- (const echrono::Steady& _obj) const;
void reset(); void reset();
}; };
etk::Stream& operator <<(etk::Stream& _os, const echrono::Steady& _obj); std::ostream& operator <<(std::ostream& _os, const echrono::Steady& _obj);
} }
#include <echrono/Duration.hpp>

131
echrono/Time.cpp
View File

@ -1,66 +1,43 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <echrono/Time.hpp> #include <echrono/Time.hpp>
#include <echrono/Duration.hpp> #include <echrono/Duration.hpp>
#include <echrono/debug.hpp> #include <echrono/debug.hpp>
#include <etk/UString.hpp>
#include <etk/stdTools.hpp>
extern "C" {
#include <time.h>
}
#include <etk/typeInfo.hpp>
ETK_DECLARE_TYPE(echrono::Time);
static int64_t getTime() { echrono::Time::Time() {
#if defined(__TARGET_OS__Android) m_data = std::chrono::system_clock::time_point(std::chrono::seconds(0));
struct timevalnow; }
gettimeofday(&now, null);
return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_usec)*1000LL; echrono::Time::Time(int64_t _valNano) {
#elif defined(__TARGET_OS__Web) \ #if defined(__TARGET_OS__MacOs) \
|| defined(__TARGET_OS__Linux) \ or defined(__TARGET_OS__IOs)
|| defined(__TARGET_OS__buildroot) \ m_data = std::chrono::system_clock::time_point(std::chrono::milliseconds(_valNano/1000));
|| 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 #else
#error must be implemented ... m_data = std::chrono::system_clock::time_point(std::chrono::nanoseconds(_valNano));
#endif #endif
return 0;
} }
echrono::Time::Time() : echrono::Time::Time(int64_t _valSec, int64_t _valNano) {
m_data(0) { 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(int64_t _valNano) : echrono::Time::Time(const std::chrono::system_clock::time_point& _val) {
m_data(_valNano) { m_data = _val;
}
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() { echrono::Time echrono::Time::now() {
return echrono::Time(getTime()); return echrono::Time(std::chrono::system_clock::now());
} }
const echrono::Time& echrono::Time::operator= (const echrono::Time& _obj) { const echrono::Time& echrono::Time::operator= (const echrono::Time& _obj) {
@ -93,48 +70,66 @@ bool echrono::Time::operator>= (const echrono::Time& _obj) const {
} }
const echrono::Time& echrono::Time::operator+= (const echrono::Duration& _obj) { const echrono::Time& echrono::Time::operator+= (const echrono::Duration& _obj) {
m_data += _obj.get(); #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
return *this; return *this;
} }
echrono::Time echrono::Time::operator+ (const echrono::Duration& _obj) const { echrono::Time echrono::Time::operator+ (const echrono::Duration& _obj) const {
echrono::Time tmp(m_data); echrono::Time time(m_data);
tmp += _obj.get(); time += _obj;
return tmp; return time;
} }
const echrono::Time& echrono::Time::operator-= (const echrono::Duration& _obj) { const echrono::Time& echrono::Time::operator-= (const echrono::Duration& _obj) {
m_data -= _obj.get(); #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
return *this; return *this;
} }
echrono::Time echrono::Time::operator- (const echrono::Duration& _obj) const { echrono::Time echrono::Time::operator- (const echrono::Duration& _obj) const {
echrono::Time tmp(m_data); echrono::Time time(m_data);
tmp -= _obj.get(); time -= _obj;
return tmp; return time;
} }
echrono::Duration echrono::Time::operator- (const echrono::Time& _obj) const { echrono::Duration echrono::Time::operator- (const echrono::Time& _obj) const {
return echrono::Duration(int64_t(m_data - _obj.m_data)); 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;
} }
void echrono::Time::reset() { void echrono::Time::reset() {
m_data = 0; m_data = std::chrono::system_clock::time_point(std::chrono::seconds(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;
}
etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Time& _obj) { std::ostream& echrono::operator <<(std::ostream& _os, const echrono::Time& _obj) {
int64_t ns = _obj.get(); std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
int64_t totalSecond = ns/1000000000; int64_t totalSecond = ns.count()/1000000000;
int64_t millisecond = (ns%1000000000)/1000000; int64_t millisecond = (ns.count()%1000000000)/1000000;
int64_t microsecond = (ns%1000000)/1000; int64_t microsecond = (ns.count()%1000000)/1000;
int64_t nanosecond = ns%1000; int64_t nanosecond = ns.count()%1000;
//_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns"; //_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns";
int32_t second = totalSecond % 60; int32_t second = totalSecond % 60;
int32_t minute = (totalSecond/60)%60; int32_t minute = (totalSecond/60)%60;
int32_t hour = (totalSecond/3600)%24; int32_t hour = (totalSecond/3600)%24;
int32_t day = (totalSecond/(24*3600))%365; int32_t day = (totalSecond/(24*3600))%365;
int32_t year = totalSecond/(24*3600*365) + 1970; int32_t year = totalSecond/(24*3600*365);
bool start = false; bool start = false;
if (year != 0) { if (year != 0) {
start = true; start = true;
@ -170,11 +165,15 @@ etk::Stream& echrono::operator <<(etk::Stream& _os, const echrono::Time& _obj) {
namespace etk { namespace etk {
template<> etk::String toString<echrono::Time>(const echrono::Time& _obj) { template<> std::string to_string<echrono::Time>(const echrono::Time& _obj) {
return etk::toString(_obj.get()); std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
} return etk::to_string(ns.count());
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
} }

22
echrono/Time.hpp
View File

@ -1,12 +1,13 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once
#include <etk/String.hpp> #include <string>
#include <etk/types.hpp> #include <etk/types.hpp>
#include <chrono>
namespace echrono { namespace echrono {
class Duration; class Duration;
@ -15,24 +16,22 @@ namespace echrono {
*/ */
class Time { class Time {
private: private:
uint64_t m_data; //!< earth time since Epock in ns std::chrono::system_clock::time_point m_data;
public: public:
Time(); Time();
//Time(const echrono::Duration& _val) {}; //value in second //Time(const echrono::Duration& _val) {}; //value in second
Time(int64_t _valNano); Time(int64_t _valNano);
Time(int64_t _valSec, int32_t _valNano); Time(int64_t _valSec, int64_t _valNano);
Time(const echrono::Time& _val); Time(const std::chrono::system_clock::time_point& _val);
~Time() {}; ~Time() {};
int64_t get() const { const std::chrono::system_clock::time_point& get() const {
return m_data; return m_data;
} }
/** /**
* @brief return the number od us since epoch (can be <0) * @brief return the number od us since epoch (can be <0)
* @return a number in us since epoch * @return a number un µs since epoch
*/ */
int64_t count() { int64_t count();
return get()/1000;
}
/** /**
* @brief get the current time * @brief get the current time
*/ */
@ -51,7 +50,6 @@ namespace echrono {
Duration operator- (const echrono::Time& _obj) const; Duration operator- (const echrono::Time& _obj) const;
void reset(); void reset();
}; };
etk::Stream& operator <<(etk::Stream& _os, const echrono::Time& _obj); std::ostream& operator <<(std::ostream& _os, const echrono::Time& _obj);
} }
#include <echrono/Duration.hpp>

2
echrono/debug.cpp
View File

@ -1,7 +1,7 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <echrono/debug.hpp> #include <echrono/debug.hpp>

2
echrono/debug.hpp
View File

@ -1,7 +1,7 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

6
echrono/echrono.cpp
View File

@ -1,7 +1,7 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <echrono/debug.hpp> #include <echrono/debug.hpp>
@ -17,11 +17,11 @@ void echrono::init(int _argc, const char** _argv) {
} }
ECHRONO_INFO("E-chrono system init"); ECHRONO_INFO("E-chrono system init");
for (int32_t iii=0; iii<_argc ; ++iii) { for (int32_t iii=0; iii<_argc ; ++iii) {
etk::String data = _argv[iii]; std::string data = _argv[iii];
if ( data == "-h" if ( data == "-h"
|| data == "--help") { || data == "--help") {
ECHRONO_PRINT("e-chrono - help : "); ECHRONO_PRINT("e-chrono - help : ");
ECHRONO_PRINT(" -h/--help: Display this help"); ECHRONO_PRINT(" -h/--help: Dispplay this help");
} else if (etk::start_with(data, "--echrono") == true) { } else if (etk::start_with(data, "--echrono") == true) {
ECHRONO_ERROR("Can not parse the argument : '" << data << "'"); ECHRONO_ERROR("Can not parse the argument : '" << data << "'");
} }

2
echrono/echrono.hpp
View File

@ -1,7 +1,7 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

8
lutin_echrono.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import realog.debug as debug import lutin.debug as debug
import lutin.tools as tools import lutin.tools as tools
@ -7,10 +7,10 @@ def get_type():
return "LIBRARY" return "LIBRARY"
def get_desc(): def get_desc():
return "E-chrono: Ewol chrono" return "E-chrono: Ewol chrono wrapper to simplify use of std::chrono (and permit to create a virtual clock)"
def get_licence(): def get_licence():
return "MPL-2" return "APACHE-2"
def get_compagny_type(): def get_compagny_type():
return "com" return "com"
@ -47,7 +47,7 @@ def configure(target, my_module):
# name of the dependency # name of the dependency
my_module.add_depend([ my_module.add_depend([
'elog', 'elog',
'etk-core', 'etk',
]) ])
my_module.add_path(".") my_module.add_path(".")

2
version.txt
View File

@ -1 +1 @@
1.0.0 0.1.0