LICENSE

@@ -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.

README.md

@@ -33,16 +33,16 @@ Developement (dev)
 [![Build Status](http://atria-soft.com/ci/build/atria-soft/elog.svg?branch=dev&tag=Android)](http://atria-soft.com/ci/atria-soft/elog)
 [![Build Status](http://atria-soft.com/ci/build/atria-soft/elog.svg?branch=dev&tag=IOs)](http://atria-soft.com/ci/atria-soft/elog)
 
-License (MPL v2.0)
+License (APACHE v2.0)
 =====================
 
 Copyright elog 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 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
 distributed under the License is distributed on an "AS IS" BASIS,

doc/mainpage.md

@@ -30,16 +30,16 @@ EWOL is **FREE software** and _all sub-library are FREE and staticly linkable !!
 
 We have no dependency expected generic lib C++ (STL or CXX)
 
-License (MPL v2.0)                          {#elog_mainpage_license}
+License (APACHE 2)                              {#elog_mainpage_license}
 ==================
 
 Copyright elog 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 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
 distributed under the License is distributed on an "AS IS" BASIS,

elog/debug.cpp

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

elog/debug.hpp

@@ -3,15 +3,12 @@
  * 
  * @copyright 2011, Edouard DUPIN, all right reserved
  * 
- * @license MPL v2.0 (see license file)
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
 #include <elog/log.hpp>
-extern "C" {
+#include <cassert>
-	#include <assert.h>
-}
-
 
 namespace elog {
 	/**

elog/elog.cpp

@@ -3,15 +3,14 @@
  * 
  * @copyright 2011, Edouard DUPIN, all right reserved
  * 
- * @license MPL v2.0 (see license file)
+ * @license APACHE v2.0 (see license file)
  */
 
 #include <elog/log.hpp>
 #include <elog/elog.hpp>
 #include <elog/debug.hpp>
-#include <etk/String.hpp>
 
-static elog::level getLogLevel(const etk::String& _value) {
+static elog::level getLogLevel(const std::string& _value) {
 	if (_value == "0") {
 		return elog::level_none;
 	} else if (_value == "1") {
@@ -31,7 +30,7 @@ static elog::level getLogLevel(const etk::String& _value) {
 	return elog::level_verbose;
 }
 
-static bool startWith(const etk::String& _obj, const etk::String& _val) {
+static bool startWith(const std::string& _obj, const std::string& _val) {
 	if (_val.size() == 0) {
 		return false;
 	}
@@ -41,50 +40,41 @@ static bool startWith(const etk::String& _obj, const etk::String& _val) {
 	for( size_t iii = 0;
 	     iii < _val.size();
 	     iii++) {
-		if (etk::toLower(_val[iii]) != etk::toLower(_obj[iii])) {
+		if (std::tolower(_val[iii]) != std::tolower(_obj[iii])) {
 			return false;
 		}
 	}
 	return true;
 }
 
-static int32_t nbTimeInit = 0;
+static std::vector<std::string> split(const std::string& _input, char _val) {
-
+	std::vector<std::string> list;
-void elog::unInit() {
+	size_t lastStartPos = 0;
-	if (nbTimeInit > 1) {
+	for(size_t iii=0; iii<_input.size(); iii++) {
-		nbTimeInit--;
+		if (_input[iii]==_val) {
-		// not the time to uninit
+			list.push_back(std::string(_input, lastStartPos, iii - lastStartPos));
-		return;
+			lastStartPos = iii+1;
 		}
-	nbTimeInit--;
-	if (nbTimeInit < 0) {
-		ELOG_ERROR("E-log system un-init More un-init than init ...");
-		nbTimeInit = 0;
-		return;
 	}
-	ELOG_INFO("E-log system un-init (BEGIN)");
+	if (lastStartPos<_input.size()) {
-	ELOG_INFO("E-log system un-init (END)");
+		list.push_back(std::string(_input, lastStartPos));
+	}
+	return list;
 }
 
-void elog::init(int _argc, const char** _argv, const etk::String& _applName) {
+void elog::init(int _argc, const char** _argv) {
-	if (nbTimeInit > 0) {
-		nbTimeInit++;
-		// already init
-		return;
-	}
-	nbTimeInit++;
 	ELOG_INFO("E-log system init (BEGIN)");
+	// retrive application Name:
+	std::string applName = _argv[0];
+	int lastSlash = applName.rfind('/');
+	applName = &applName[lastSlash+1];
+	// get name: applName
 	bool userSpecifyLogFile = false;
 	for (int32_t iii=0; iii<_argc ; ++iii) {
-		etk::String data = _argv[iii];
+		std::string data = _argv[iii];
 		if (startWith(data, "--elog-level=")) {
-			ELOG_INFO("Change global level at " << getLogLevel(etk::String(data.begin()+13, data.end())));
+			ELOG_INFO("Change global level at " << getLogLevel(std::string(data.begin()+13, data.end())));
-			elog::setLevel(getLogLevel(etk::String(data.begin()+13, data.end())));
+			elog::setLevel(getLogLevel(std::string(data.begin()+13, data.end())));
-		} else if (startWith(data, "--elog-max-line=")) {
-			etk::String dataToParse = &data[16];
-			int value = 0;
-			sscanf(dataToParse.c_str(), "%d", &value);
-			elog::setMaxLineNumberInFile(value);
 		} else if (data == "--elog-color") {
 			elog::setColor(true);
 		} else if (data == "--elog-no-color") {
@@ -92,7 +82,7 @@ void elog::init(int _argc, const char** _argv, const etk::String& _applName) {
 		} else if (data == "--elog-back-trace") {
 			elog::setBackTrace(true);
 		} else if (startWith(data, "--elog-file=")) {
-			etk::String value(data.begin()+12, data.end());
+			std::string value(data.begin()+12, data.end());
 			if (value.size() == 0) {
 				elog::unsetLogInFile();
 			} else {
@@ -100,7 +90,7 @@ void elog::init(int _argc, const char** _argv, const etk::String& _applName) {
 			}
 			userSpecifyLogFile = true;
 		} else if (startWith(data, "--elog-config=")) {
-			etk::String value(data.begin()+14, data.end());
+			std::string value(data.begin()+14, data.end());
 			elog::setTime(false);
 			elog::setLine(false);
 			elog::setFunction(false);
@@ -125,12 +115,12 @@ void elog::init(int _argc, const char** _argv, const etk::String& _applName) {
 				}
 			}
 		} else if (startWith(data, "--elog-lib=")) {
-			etk::String value(data.begin()+11, data.end());
+			std::string value(data.begin()+11, data.end());
-			etk::Vector<etk::String> list = value.split('/');
+			std::vector<std::string> list = split(value, '/');
 			if (list.size() != 2) {
-				list = value.split(':');
+				list = split(value, ':');
 				if (list.size() != 2) {
-					list = value.split('+');
+					list = split(value, '+');
 					if (list.size() != 2) {
 						ELOG_ERROR("Can not set the --elog-lib= with value='" << value << "' not formated name:X or name/X or name+X");
 						continue;
@@ -142,11 +132,7 @@ void elog::init(int _argc, const char** _argv, const etk::String& _applName) {
 		} else if (    data == "-h"
 		            || data == "--help") {
 			ELOG_PRINT("elog - help : ");
-			if (_argc >= 1) {
 			ELOG_PRINT("    " << _argv[0] << " [options]");
-			} else {
-				ELOG_PRINT("    ? ? ? ? ? ? ? ? ? [options]");
-			}
 			ELOG_PRINT("        --elog-level=            Change the default log level (set all Log level):");
 			ELOG_PRINT("            0: debug None (default in release)");
 			ELOG_PRINT("            1: debug Critical");
@@ -160,7 +146,6 @@ void elog::init(int _argc, const char** _argv, const etk::String& _applName) {
 			ELOG_PRINT("            X     Log level to set [0..6]");
 			ELOG_PRINT("            note: ':' can be replace with '/' or '+'");
 			ELOG_PRINT("        --elog-file=pathToFile   File to store the logs: (disable console logs)");
-			ELOG_PRINT("        --elog-max-line=XXX      Number of line in the log file");
 			ELOG_PRINT("        --elog-color             Enable color in log (default in Linux/debug)");
 			ELOG_PRINT("        --elog-no-color          Disable color in log (default in Linux/release and Other)");
 			ELOG_PRINT("        --elog-back-trace        Enable back-trace when an error log level is generated (to get a fast debug)");
@@ -175,9 +160,7 @@ void elog::init(int _argc, const char** _argv, const etk::String& _applName) {
 			ELOG_PRINT("            f: diplay function name");
 			ELOG_PRINT("        -h/--help:               Dispplay this help");
 			ELOG_PRINT("    example:");
-			if (_argc >= 1) {
 			ELOG_PRINT("        " << _argv[0] << " --elog-color --elog-level=2 --elog-lib=etk:5 --elog-lib=appl:6 --elog-config=NLlf");
-			}
 		} else if (startWith(data, "--elog") == true) {
 			ELOG_ERROR("Can not parse the argument : '" << data << "'");
 		}
@@ -189,15 +172,17 @@ void elog::init(int _argc, const char** _argv, const etk::String& _applName) {
 			#endif
 		#else
 			#if defined(__TARGET_OS__Linux)
-				//elog::setLogInFile("/var/log/elog_" +_applName + ".log");
+				//elog::setLogInFile("/var/log/elog_" +applName + ".log");
-				elog::setLogInFile("/tmp/elog_" +_applName + ".log");
+				elog::setLogInFile("/tmp/elog_" +applName + ".log");
 			#elif defined(__TARGET_OS__MacOs)
-				elog::setLogInFile(_applName + ".log");
+				elog::setLogInFile(applName + ".log");
 			#elif defined(__TARGET_OS__Windows)
-				elog::setLogInFile(_applName + ".log");
+				elog::setLogInFile(applName + ".log");
 			#endif
 		#endif
 	}
+	
 	ELOG_INFO("E-LOG system init (END)");
 }
 
+

elog/elog.hpp

@@ -3,25 +3,20 @@
  * 
  * @copyright 2011, Edouard DUPIN, all right reserved
  * 
- * @license MPL v2.0 (see license file)
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
-#include <etk/String.hpp>
+#include <string>
 /**
- * @brief basic namespace of the elog library. (it might contain all the elog fuctions without macro).
+ * @brief basic namespace of the elog library. (it might contain all the elog fuctions without macro)
  */
 namespace elog {
 	/**
-	 * @brief Initialize elog.
+	 * @brief Initialize elog
-	 * @param[in] _argc Number of argument list.
+	 * @param[in] _argc Number of argument list
-	 * @param[in] _argv List of arguments.
+	 * @param[in] _argv List of arguments
-	 * @param[in] _applName Current application Name.
 	 */
-	void init(int _argc, const char** _argv, const etk::String& _applName);
+	void init(int _argc, const char** _argv);
-	/**
-	 * @brief Un-Initialize elog.
-	 */
-	void unInit();
 }
 

elog/log.cpp

@@ -3,18 +3,22 @@
  * 
  * @copyright 2011, Edouard DUPIN, all right reserved
  * 
- * @license MPL v2.0 (see license file)
+ * @license APACHE v2.0 (see license file)
  */
 
 #include <elog/log.hpp>
 #include <elog/debug.hpp>
 #include <time.h>
-#include <ethread/Mutex.hpp>
+#include <mutex>
-#include <ethread/Thread.hpp>
+#include <thread>
-#include <etk/Map.hpp>
+#include <map>
 #include <inttypes.h>
+#ifdef ELOG_BUILD_ETHREAD
 	#include <ethread/tools.hpp>
+#endif
 #include <elog/debug.hpp>
+#include <cstring>
+#include <iostream>
 
 #if defined(__TARGET_OS__Android)
 #	include <android/log.h>
@@ -22,11 +26,7 @@
 
 #include <elog/logIOs.h>
 
-#if    !defined(__STDCPP_LLVM__) \
+#if !defined(__STDCPP_LLVM__) && defined(__TARGET_OS__Linux) && defined(DEBUG)
-    && defined(__TARGET_OS__Linux) \
-    && defined(DEBUG) \
-    && !defined(__TARGET_OS__Web) \
-    && !defined(__TARGET_OS__buildroot)
 	#include <execinfo.h>
 	#include <cxxabi.h>
 	#include <dlfcn.h>
@@ -37,14 +37,14 @@
 		int stack_depth = backtrace(trace, MAX_DEPTH);
 		
 		ELOG_PRINT("Back-trace : ");
-		for (int32_t iii = 1; iii < stack_depth; ++iii) {
+		for (int32_t i = 1; i < stack_depth; i++) {
 			Dl_info dlinfo;
-			if(!dladdr(trace[iii], &dlinfo)) {
+			if(!dladdr(trace[i], &dlinfo)) {
 				break;
 			}
 			const char * symname = dlinfo.dli_sname;
 			int    status;
-			char * demangled = abi::__cxa_demangle(symname, null, 0, &status);
+			char * demangled = abi::__cxa_demangle(symname, nullptr, 0, &status);
 			if(status == 0 && demangled) {
 				symname = demangled;
 			}
@@ -53,7 +53,7 @@
 				ELOG_PRINT("        " << symname);
 			}
 			_removeElement--;
-			if(demangled != null) {
+			if(demangled != nullptr) {
 				free(demangled);
 			}
 		}
@@ -61,25 +61,6 @@
 			assert(false);
 		}
 	}
-#elif    defined(__TARGET_OS__MacOs) \
-      && defined(DEBUG) \
-      && defined(__MAC_10_5)
-	#include <execinfo.h>
-	#include <stdio.h>
-	#define MAX_DEPTH  (256)
-	void elog::displayBacktrace(bool _breakAtEnd, int32_t _removeElement) {
-		void* callstack[MAX_DEPTH];
-		uint32_t frames = backtrace(callstack, MAX_DEPTH);
-		char** strs = backtrace_symbols(callstack, frames);
-		ELOG_PRINT("Back-trace : ");
-		for (uint32_t iii=0; iii<frames; ++iii) {
-			ELOG_PRINT("    " << strs[iii]);
-		}
-		if (_breakAtEnd == true) {
-			assert(false);
-		}
-		free(strs);
-	}
 #else
 	void elog::displayBacktrace(bool _breakAtEnd, int32_t _removeElement) {
 		#ifdef DEBUG
@@ -90,8 +71,7 @@
 
 #ifdef DEBUG
 	#define DEFAULT_LOG_LEVEL elog::level_info
-	#if    defined(__TARGET_OS__Windows) \
+	#if defined(__TARGET_OS__Windows)
-	    || defined(__TARGET_OS__Web)
 		#define DEFAULT_LOG_COLOR false
 	#else
 		#define DEFAULT_LOG_COLOR true
@@ -132,34 +112,33 @@ size_t& getNameSizeLog() {
 	static size_t g_val = 5;
 	return g_val;
 }
-
+static std::vector<std::pair<std::string, enum elog::level> >& getList() {
-static etk::Vector<etk::Pair<etk::String, enum elog::level> >& getList() {
+	static std::vector<std::pair<std::string, enum elog::level> > g_val;
-	static etk::Vector<etk::Pair<etk::String, enum elog::level> > g_val;
 	return g_val;
 }
 
-int32_t elog::registerInstance(const etk::String& _name) {
+int32_t elog::registerInstance(const std::string& _name) {
 	for (size_t iii = 0; iii < getList().size(); ++iii) {
 		if (getList()[iii].first == _name) {
 			return iii;
 		}
 	}
-	getList().pushBack(etk::makePair(_name, getDefaultLevel()));
+	getList().push_back(std::make_pair(_name, getDefaultLevel()));
 	if (_name.size() >= getNameSizeLog()) {
 		getNameSizeLog() = _name.size()+1;
 	}
-	//printf("register log : '%s'=%ld\n", _name.c_str(), getList().size()-1);
+	//std::cout << "register log : '" << _name << "'=" << getList().size()-1 << std::endl;
 	return getList().size()-1;
 }
 
-void elog::setLevel(const etk::String& _name, enum level _level) {
+void elog::setLevel(const std::string& _name, enum level _level) {
 	for (size_t iii = 0; iii < getList().size(); ++iii) {
 		if (getList()[iii].first == _name) {
 			getList()[iii].second = _level;
 			return;
 		}
 	}
-	getList().pushBack(etk::makePair(_name, _level));
+	getList().push_back(std::make_pair(_name, _level));
 }
 
 void elog::setLevel(enum level _level) {
@@ -186,24 +165,30 @@ int32_t elog::getLevel(int32_t _id) {
 	return (int32_t)getList()[_id].second;
 }
 
-etk::Vector<etk::String> elog::getListInstance() {
+std::vector<std::string> elog::getListInstance() {
-	etk::Vector<etk::String> out;
+	std::vector<std::string> out;
 	for (size_t iii = 0; iii < getList().size(); ++iii) {
-		out.pushBack(getList()[iii].first);
+		out.push_back(getList()[iii].first);
 	}
 	return out;
 }
 
-void elog::logStream(int32_t _id, int32_t _level, int32_t _ligne, const char* _funcName, const etk::Stream& _log) {
+void elog::logStream(int32_t _id, int32_t _level, int32_t _ligne, const char* _funcName, const std::ostream& _log) {
-	elog::logChar(_id, _level, _ligne, _funcName, _log.c_str());
+	std::ostringstream oss;
+	oss << _log.rdbuf();
+	std::string sss =oss.str();
+	elog::logChar(_id, _level, _ligne, _funcName, sss.c_str());
 }
 
 void elog::logChar1(int32_t _id, int32_t _level, const char* _log) {
-	elog::logChar(_id, _level, -1, null, _log);
+	elog::logChar(_id, _level, -1, nullptr, _log);
 }
 
-void elog::logStream1(int32_t _id, int32_t _level, const etk::Stream& _log) {
+void elog::logStream1(int32_t _id, int32_t _level, const std::ostream& _log) {
-	elog::logChar(_id, _level, -1, null, _log.c_str());
+	std::ostringstream oss;
+	oss << _log.rdbuf();
+	std::string sss =oss.str();
+	elog::logChar(_id, _level, -1, nullptr, sss.c_str());
 }
 
 static bool& getColor() {
@@ -274,7 +259,7 @@ void elog::setBackTrace(bool _status) {
 static void getDisplayTime(char* data) {
 #ifdef __TARGET_OS__Android
 	struct timeval  now;
-	gettimeofday(&now, null);
+	gettimeofday(&now, nullptr);
 	sprintf(data, " %2dh%2d'%2d ", (int32_t)(now.tv_sec/3600)%24, (int32_t)(now.tv_sec/60)%60, (int32_t)(now.tv_sec%60));
 #else
 	time_t rawtime;
@@ -285,128 +270,36 @@ static void getDisplayTime(char* data) {
 #endif
 }
 
-static ethread::Mutex g_lock;
+static std::mutex g_lock;
-static elog::callbackLog callbackUserLog(null);
+static elog::callbackLog callbackUserLog(nullptr);
 
-static etk::String& getLogFileName() {
-	static etk::String g_val="";
-	return g_val;
-}
 static FILE*& getLogFile() {
-	static FILE* g_val=null;
+	static FILE* file=nullptr;
-	return g_val;
+	return file;
 }
 
-static size_t& getLogFileCount() {
+void elog::setLogInFile(const std::string& _filename) {
-	static size_t g_val = 0;
-	return g_val;
-}
-
-static size_t& getLogFileMaxCount() {
-	static size_t g_val = 0;
-	return g_val;
-}
-
-void elog::setMaxLineNumberInFile(size_t _status) {
-	getLogFileMaxCount() = _status;
-}
-
-
-// Copy for ETK FSNODE ...     [START]
-
-extern "C" {
-	// file browsing ...
-	#include <dirent.h>
-	#include <sys/stat.h>
-	#include <errno.h>
-}
-
-static int32_t FSNODE_LOCAL_mkdir(const char* _path, mode_t _mode) {
-	struct stat st;
-	int32_t status = 0;
-	if (stat(_path, &st) != 0) {
-		/* Directory does not exist. EEXIST for race condition */
-		#ifdef __TARGET_OS__Windows
-		if(mkdir(_path) != 0
-		#else
-		if(mkdir(_path, _mode) != 0
-		#endif
-		    && errno != EEXIST) {
-			status = -1;
-		}
-	} else if (!S_ISDIR(st.st_mode)) {
-		errno = ENOTDIR;
-		status = -1;
-	}
-	return(status);
-}
-
-static int32_t FSNODE_LOCAL_mkPath(const char* _path, mode_t _mode) {
-	char *pp;
-	char *sp;
-	int status;
-	char *copypath = strdup(_path);
-	if (null==copypath) {
-		return -1;
-	}
-	status = 0;
-	pp = copypath;
-	while (status == 0 && (sp = strchr(pp, '/')) != 0) {
-		if (sp != pp) {
-			/* Neither root nor double slash in path */
-			*sp = '\0';
-			status = FSNODE_LOCAL_mkdir(copypath, _mode);
-			*sp = '/';
-		}
-		pp = sp + 1;
-	}
-	if (status == 0) {
-		status = FSNODE_LOCAL_mkdir(_path, _mode);
-	}
-	free(copypath);
-	return (status);
-}
-
-static bool FSNODE_LOCAL_exist(const etk::String& _path) {
-	struct stat st;
-	int32_t status = 0;
-	if (stat(_path.c_str(), &st) != 0) {
-		return false;
-	}
-	return true;
-}
-// Copy for ETK FSNODE ...     [END]
-
-void elog::setLogInFile(const etk::String& _filename) {
 	elog::unsetLogInFile();
 	ELOG_PRINT("Log in file: '" << _filename << "'");
-	getLogFileName() = _filename;
-	FILE*& file = getLogFile();
-	// create path of the file:
-	size_t found=_filename.rfind("/\\");
-	etk::String path = _filename.extract(0,found);
-	if (FSNODE_LOCAL_exist(path) == false) {
-		FSNODE_LOCAL_mkPath(path.c_str(), 0760);
-	}
 	g_lock.lock();
+	FILE*& file = getLogFile();
 	file = fopen(_filename.c_str(), "w");
-	g_lock.unLock();
+	g_lock.unlock();
-	if (file == null) {
+	if (file == nullptr) {
 		ELOG_ERROR("Can not open file: '" << _filename << "'");
 	}
 }
 
 void elog::unsetLogInFile() {
-	getLogFileName() = "";
 	g_lock.lock();
 	FILE*& file = getLogFile();
 	// close file only if needed ...
-	if (file != null) {
+	if (file != nullptr) {
 		fflush(file);
 		fclose(file);
-		file = null;
+		file = nullptr;
 	}
-	g_lock.unLock();
+	g_lock.unlock();
 }
 
 
@@ -414,7 +307,7 @@ void elog::setCallbackLog(const elog::callbackLog& _callback) {
 	// TODO : Check atomicity ...
 	g_lock.lock();
 	callbackUserLog = _callback;
-	g_lock.unLock();
+	g_lock.unlock();
 }
 //regular colors
 #define ETK_BASH_COLOR_BLACK			"\e[0;30m"
@@ -452,16 +345,16 @@ void elog::setCallbackLog(const elog::callbackLog& _callback) {
 
 void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _funcName, const char* _log) {
 	// special callback mode:
-	if (callbackUserLog != null) {
+	if (callbackUserLog != nullptr) {
 		const char* libName = "";
 		if (_id >= 0) {
 			libName = getList()[_id].first.c_str();
 		}
 		g_lock.lock();
-		if (callbackUserLog != null) {
+		if (callbackUserLog != nullptr) {
 			callbackUserLog(libName, elog::level(_level), _ligne, _funcName, _log);
 		}
-		g_lock.unLock();
+		g_lock.unlock();
 		return;
 	}
 	char handle[LENGHT_MAX_LOG] = "";
@@ -557,7 +450,7 @@ void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _fun
 		}
 		if(getThreadNameEnable() == true) {
 			// display thread ID
-			etk::String name = ethread::getName();
+			std::string name = ethread::getName();
 			if (name.size() >= getThreadSizeLog() ) {
 				getThreadSizeLog() = name.size() + 1;
 			}
@@ -586,29 +479,29 @@ void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _fun
 		int32_t len = strlen(handle);
 		char tmpName[1024];
 		char *tmpPointer = tmpName;
-		if (_funcName != null) {
+		if (_funcName != nullptr) {
 			// cleen for android :
 			char* startPos = strchr((char*)_funcName, ' ');
 			char* stopPos = strchr((char*)_funcName, '(');
-			if (startPos != null) {
+			if (startPos != nullptr) {
-				if (stopPos != null) {
+				if (stopPos != nullptr) {
 					char* startPos2 = strchr(startPos+1, ' ');
-					while (    startPos2 != null
+					while (    startPos2 != nullptr
 					        && startPos2 < stopPos) {
 						startPos = startPos2;
 						startPos2 = strchr(startPos+1, ' ');
 					}
 					if(uint64_t(stopPos) < uint64_t(startPos)) {
-						snprintf(tmpPointer, etk::min(uint64_t(1024), uint64_t(stopPos)-uint64_t(_funcName)), "%s", _funcName);
+						snprintf(tmpPointer, std::min(uint64_t(1024), uint64_t(stopPos)-uint64_t(_funcName)), "%s", _funcName);
 					} else {
-						snprintf(tmpPointer, etk::min(uint64_t(1024), uint64_t(stopPos)-uint64_t(startPos)), "%s", startPos+1);
+						snprintf(tmpPointer, std::min(uint64_t(1024), uint64_t(stopPos)-uint64_t(startPos)), "%s", startPos+1);
 					}
 				} else {
 					snprintf(tmpPointer, 1024, "%s", startPos);
 				}
 			} else {
-				if (stopPos != null) {
+				if (stopPos != nullptr) {
-					snprintf(tmpPointer, etk::min(uint64_t(1024), uint64_t(stopPos)-uint64_t(_funcName)+1), "%s", _funcName);
+					snprintf(tmpPointer, std::min(uint64_t(1024), uint64_t(stopPos)-uint64_t(_funcName)+1), "%s", _funcName);
 				} else {
 					snprintf(tmpPointer, 1024, "%s", _funcName);
 				}
@@ -648,13 +541,11 @@ void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _fun
 	g_lock.lock();
 	{
 		FILE*& file = getLogFile();
-		size_t& fileCurrentCount = getLogFileCount();
-		size_t& fileMaxCount = getLogFileMaxCount();
 		// close file only if needed ...
-		if (file != null) {
+		if (file != nullptr) {
 			*pointer++ = '\n';
 			*pointer = '\0';
-			fprintf(file, "%s", handle);
+			fprintf(file, handle);
 			switch(_level) {
 				default:
 					break;
@@ -663,26 +554,8 @@ void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _fun
 					fflush(file);
 					break;
 			}
-			// Increment the line counter in file
-			fileCurrentCount++;
-			if (fileMaxCount != 0) {
-				// the user request a maximum line number in the file:
-				if (fileCurrentCount > fileMaxCount) {
-					fileCurrentCount = 0;
-					fflush(file);
-					fclose(file);
-					etk::String tmpFileName = getLogFileName();
-					if (    tmpFileName.size() > 0
-					     && tmpFileName[tmpFileName.size()-1] == '2') {
-						getLogFileName().popBack();
-					} else {
-						getLogFileName() += "2";
-					}
-					file = fopen(getLogFileName().c_str(), "w");
-				}
-			}
 			// if we log in file, we have no need to log otherwise ... just "tail -f log.txt"
-			g_lock.unLock();
+			g_lock.unlock();
 			return;
 		}
 	}
@@ -716,13 +589,11 @@ void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _fun
 	#elif defined(__TARGET_OS__IOs)
 		iosNSLog(handle);
 	#else
-		printf("%s\n", handle);
+		std::cout << handle << std::endl;
 	#endif
-	g_lock.unLock();
+	g_lock.unlock();
 	if (_level == level_critical) {
-		#if defined(DEBUG)
+		std::this_thread::sleep_for(std::chrono::milliseconds(700));
-		ethread::sleepMilliSeconds(700);
-		#endif
 		displayBacktrace(true, 2);
 	}
 	// Display backtrace to facilitate the error problems
@@ -733,13 +604,3 @@ void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _fun
 }
 
 
-void elog::flush() {
-	g_lock.lock();
-	FILE*& file = getLogFile();
-	if (file != null) {
-		fflush(file);
-	}
-	fflush(stdout);
-	g_lock.unLock();
-	return;
-}

elog/log.hpp

@@ -3,15 +3,14 @@
  * 
  * @copyright 2011, Edouard DUPIN, all right reserved
  * 
- * @license MPL v2.0 (see license file)
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
-#include <etk/Stream.hpp>
+#include <sstream>
-#include <etk/Vector.hpp>
+#include <ostream>
-#include <etk/String.hpp>
+#include <vector>
-#include <etk/Stream.hpp>
+#include <functional>
-#include <etk/Function.hpp>
 
 namespace elog {
 	/**
@@ -33,7 +32,7 @@ namespace elog {
 	 * @param[in] _name Name of the module
 	 * @return reference Id of an instance name
 	 */
-	int32_t registerInstance(const etk::String& _name);
+	int32_t registerInstance(const std::string& _name);
 	/**
 	 * @brief Set the log level of a specific instance
 	 * @param[in] _name Name of the intance
@@ -42,7 +41,7 @@ namespace elog {
 	 *   elog::setLevel("ewol", elog::level_critical);
 	 * @endcode
 	 */
-	void setLevel(const etk::String& _name, enum elog::level _level);
+	void setLevel(const std::string& _name, enum elog::level _level);
 	/**
 	 * @brief Set the log level of a specific instance
 	 * @param[in] _id Id of the intance
@@ -67,7 +66,7 @@ namespace elog {
 	 * @brief Get list of all intance
 	 * @return the name list of all intance
 	 */
-	etk::Vector<etk::String> getListInstance();
+	std::vector<std::string> getListInstance();
 	/**
 	 * @brief Set Color enable or disable.
 	 * @param[in] _status New value of color.
@@ -108,11 +107,6 @@ namespace elog {
 	 * @param[in] _status New value.
 	 */
 	void setBackTrace(bool _status);
-	/**
-	 * @brief Set back-trace display on Error log enable or disable.
-	 * @param[in] _status New number of lines.
-	 */
-	void setMaxLineNumberInFile(size_t _status);
 	/**
 	 * @brief Call log to display
 	 * @param[in] _id Id of the instance type
@@ -130,7 +124,7 @@ namespace elog {
 	 * @param[in] _funcName Function name for debug (compleate decorate signature)
 	 * @param[in] _log Stream to log
 	 */
-	void logStream(int32_t _id, int32_t _level, int32_t _ligne, const char* _funcName, const etk::Stream& _log);
+	void logStream(int32_t _id, int32_t _level, int32_t _ligne, const char* _funcName, const std::ostream& _log);
 	/**
 	 * @brief Call log to display
 	 * @param[in] _id Id of the instance type
@@ -144,7 +138,7 @@ namespace elog {
 	 * @param[in] _level Level debug
 	 * @param[in] _log Stream to log
 	 */
-	void logStream1(int32_t _id, int32_t _level, const etk::Stream& _log);
+	void logStream1(int32_t _id, int32_t _level, const std::ostream& _log);
 	/**
 	 * @brief Display the current backtrace
 	 * @param[in] _breakAtEnd assert program when backtrace is printed
@@ -159,7 +153,7 @@ namespace elog {
 	 * @param[in] _funcName Full function name: 'void etk::MyClass::functionName(...)'
 	 * @param[in] _log String containing the Log
 	 */
-	using callbackLog = etk::Function<void (const char* _libName, enum elog::level _level, int32_t _ligne, const char* _funcName, const char* _log)>;
+	using callbackLog = std::function<void (const char* _libName, enum elog::level _level, int32_t _ligne, const char* _funcName, const char* _log)>;
 	/**
 	 * @brief Set a callback to display all log in an other framework
 	 * @param[in] _callback Function to call when log arrive
@@ -170,27 +164,24 @@ namespace elog {
 	 * @param[in] _filename Name of the file to log (if not set the log system select alone the log file)
 	 * @note in release the log is automatically store in a file in the system. (windows log is done in file automatically)
 	 */
-	void setLogInFile(const etk::String& _filename="");
+	void setLogInFile(const std::string& _filename="");
 	/**
 	 * @brief Disable log in a file
 	 */
 	void unsetLogInFile();
-	/**
-	 * @brief When loggin in file, the flush is not done automaticaly ==> need to do it manualy
-	 */
-	void flush();
 };
 
 /**
  * @brief Basic macro of all logs macros
  * @param[in] logId Id of the library that log
  * @param[in] info Log level of this log: elog::level
- * @param[in] data Stream separaated with "<<" convertible in etk::Stream
+ * @param[in] data Stream separaated with "<<" convertible in std::ostream
  */
 #define ELOG_BASE(logId,info,data) \
 	do { \
 		if (info <= elog::getLevel(logId)) { \
-			etk::Stream tmpStream; \
+			std::stringbuf sb; \
+			std::ostream tmpStream(&sb); \
 			tmpStream << data; \
 			elog::logStream(logId, info, __LINE__, __PRETTY_FUNCTION__, tmpStream); \
 		} \

elog/logIOs.h

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

elog/logIOs.m

@@ -3,7 +3,7 @@
  *
  * @copyright 2011, Edouard DUPIN, all right reserved
  *
- * @license MPL v2.0 (see license file)
+ * @license APACHE v2.0 (see license file)
  */
 
 

lutin_elog-sample.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import realog.debug as debug
+import lutin.debug as debug
 import lutin.tools as tools
 
 
@@ -13,7 +13,7 @@ def get_desc():
 	return "elog sample"
 
 def get_licence():
-	return "MPL-2"
+	return "APACHE-2"
 
 def get_compagny_type():
 	return "com"
@@ -36,7 +36,7 @@ def configure(target, my_module):
 	    ])
 	# build in C++ mode
 	my_module.compile_version("c++", 2011)
-	my_module.add_depend(['elog', 'cxx'])
+	my_module.add_depend('elog')
 	my_module.add_path('sample')
 	return True
 

lutin_elog.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import realog.debug as debug
+import lutin.debug as debug
 import lutin.tools as tools
 
 def get_type():
@@ -9,7 +9,7 @@ def get_desc():
 	return "Ewol log basic interface"
 
 def get_licence():
-	return "MPL-2"
+	return "APACHE-2"
 
 def get_compagny_type():
 	return "com"
@@ -58,8 +58,8 @@ def configure(target, my_module):
 	my_module.compile_version("c++", 2011)
 	my_module.compile_version("c", 1999)
 	# add dependency of the generic C++ library:
-	my_module.add_optionnal_depend('etk-core')
+	my_module.add_depend('cxx')
-	my_module.add_optionnal_depend('ethread-tools', ["c++", "-DELOG_BUILD_ETHREAD"])
+	my_module.add_optionnal_depend('ethread', ["c++", "-DELOG_BUILD_ETHREAD"])
 	
 	if "Windows" in target.get_type():
 		pass

lutin_test-debug.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
-import realog.debug as debug
+import lutin.debug as debug
 import lutin.tools as tools
-import realog.debug as debug
+import lutin.debug as debug
 
 
 def get_type():
@@ -14,7 +14,7 @@ def get_desc():
 	return "basic debug log for test"
 
 def get_licence():
-	return "MPL-2"
+	return "APACHE-2"
 
 def get_compagny_type():
 	return "com"
@@ -32,7 +32,7 @@ def configure(target, my_module):
 	my_module.add_header_file([
 		'test-debug/debug.hpp'
 		])
-	my_module.add_depend('etk-core')
+	my_module.add_depend('etk')
 	my_module.add_path(".")
 	return True
 

sample/debug.cpp

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

sample/debug.hpp

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

sample/main.cpp

@@ -3,12 +3,13 @@
  * 
  * @copyright 2016, Edouard DUPIN, all right reserved
  * 
- * @license MPL v2.0 (see license file)
+ * @license APACHE v2.0 (see license file)
  */
 //! [elog_sample_main_include]
 #include "debug.hpp"
 #include <elog/elog.hpp>
 //! [elog_sample_main_include]
+#include <iostream>
 
 //! [elog_sample_main_callback]
 //! [elog_sample_main_callback_DECLARATION]
@@ -16,31 +17,31 @@ static void myExternalLogCallback(const char* _libName, enum elog::level _level,
 //! [elog_sample_main_callback_DECLARATION]
 	switch(_level) {
 		default:
-			printf("[?] ");
+			std::cout << "[?] ";
 			break;
 		case elog::level_print:
-			printf("[P] ");
+			std::cout << "[P] ";
 			break;
 		case elog::level_critical:
-			printf("[C] ");
+			std::cout << "[C] ";
 			break;
 		case elog::level_error:
-			printf("[E] ");
+			std::cout << "[E] ";
 			break;
 		case elog::level_warning:
-			printf("[W] ");
+			std::cout << "[W] ";
 			break;
 		case elog::level_info:
-			printf("[I] ");
+			std::cout << "[I] ";
 			break;
 		case elog::level_debug:
-			printf("[D] ");
+			std::cout << "[D] ";
 			break;
 		case elog::level_verbose:
-			printf("[V] ");
+			std::cout << "[V] ";
 			break;
 	}
-	printf("%s (%d) %s | %s\n", _libName, _ligne, _funcName, _log);
+	std::cout << _libName << " (" << _ligne << ") " << _funcName << " | " << _log << std::endl;
 }
 //! [elog_sample_main_callback]
 
@@ -48,15 +49,13 @@ static void myExternalLogCallback(const char* _libName, enum elog::level _level,
 //! [elog_sample_main]
 /**
  * @brief Main of the program (This can be set in every case, but it is not used in Andoid...).
- * @param[in] _argc standard input argument count
+ * @param std IO
- * @param[in] _argv standard input argument data (pointer on strings)
+ * @return std IO
- * @return <0 an error occurred
- * @return all is good otherwise
  */
 //! [elog_sample_main_base]
 int main(int _argc, const char *_argv[]) {
 	// if you use etk/ewol/gale, elog init in contain in it.
-	elog::init(_argc, _argv, "appl_name");
+	elog::init(_argc, _argv);
 	//! [elog_sample_main_base]
 	//! [elog_sample_main_log]
 	APPL_VERBOSE("VERBOSE display");
@@ -67,12 +66,14 @@ int main(int _argc, const char *_argv[]) {
 	APPL_PRINT("PRINT display");
 	//APPL_CRITICAL("CRITICAL display"); // Disable critical because it create an assert ...
 	//! [elog_sample_main_log]
+	
 	// Change the global log level:
 	elog::setLevel(elog::level_verbose);
 	//! [elog_sample_main_callback_link]
 	// Set a callback:
 	elog::setCallbackLog(&myExternalLogCallback);
 	//! [elog_sample_main_callback_link]
+	
 	// try again new logs:
 	APPL_VERBOSE("VERBOSE display");
 	APPL_DEBUG("DEBUG display");
@@ -80,6 +81,8 @@ int main(int _argc, const char *_argv[]) {
 	APPL_WARNING("WARNING display");
 	APPL_ERROR("ERROR display");
 	APPL_PRINT("PRINT display");
+	
+	
 	return 0;
 }
 //! [elog_sample_main]

test-debug/debug.cpp

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

test-debug/debug.hpp

@@ -1,7 +1,7 @@
 /** @file
  * @author Edouard DUPIN
  * @copyright 2011, Edouard DUPIN, all right reserved
- * @license MPL v2.0 (see license file)
+ * @license APACHE v2.0 (see license file)
  */
 
 #include <etk/types.hpp>
@@ -20,10 +20,17 @@ namespace test {
 #define TEST_CRITICAL(data)      TEST_BASE(1, data)
 #define TEST_ERROR(data)         TEST_BASE(2, data)
 #define TEST_WARNING(data)       TEST_BASE(3, data)
+#ifdef DEBUG
 	#define TEST_INFO(data)          TEST_BASE(4, data)
 	#define TEST_DEBUG(data)         TEST_BASE(5, data)
 	#define TEST_VERBOSE(data)       TEST_BASE(6, data)
 	#define TEST_TODO(data)          TEST_BASE(4, "TODO : " << data)
+#else
+	#define TEST_INFO(data)          do { } while(false)
+	#define TEST_DEBUG(data)         do { } while(false)
+	#define TEST_VERBOSE(data)       do { } while(false)
+	#define TEST_TODO(data)          do { } while(false)
+#endif
 
 #define TEST_HIDDEN(data)          do { } while(false)
 

version.txt

@@ -1 +1 @@
-1.0.0
+0.4.0