Compare commits

...

15 Commits

30 changed files with 612 additions and 444 deletions

View File

@ -52,9 +52,9 @@ install:
before_script: before_script:
- cd .. - cd ..
- git clone https://github.com/atria-soft/elog.git - git clone https://github.com/atria-soft/elog.git -b $TRAVIS_BRANCH
- git clone https://github.com/atria-soft/etk.git - git clone https://github.com/atria-soft/etk.git -b $TRAVIS_BRANCH
- git clone https://github.com/atria-soft/ememory.git - git clone https://github.com/atria-soft/ememory.git -b $TRAVIS_BRANCH
- git clone https://github.com/generic-library/gtest-lutin.git --recursive - git clone https://github.com/generic-library/gtest-lutin.git --recursive
- git clone https://github.com/generic-library/z-lutin.git --recursive - git clone https://github.com/generic-library/z-lutin.git --recursive
- pwd - pwd
@ -72,7 +72,7 @@ after_script:
- if [ "$GCOV" != "" ]; then - if [ "$GCOV" != "" ]; then
./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/esignal/; ./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/esignal/;
fi fi
- ./out/Linux_x86_64/$CONF/staging/$BUILDER/esignal-test/esignal-test.app/bin/esignal-test --elog-level=3 | tee out_test.txt - lutin -w -j4 -C -P -t$TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF $GCOV $DISABLE_PACKAGE esignal-test?run:--elog-level=3 | tee out_test.txt
- if [ "$GCOV" != "" ]; then - if [ "$GCOV" != "" ]; then
./ci/test_send.py --file=out_test.txt; ./ci/test_send.py --file=out_test.txt;
lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p esignal?gcov; lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p esignal?gcov;

510
LICENSE
View File

@ -1,201 +1,373 @@
Apache License Mozilla Public License Version 2.0
Version 2.0, January 2004 ==================================
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions
--------------
1. Definitions. 1.1. "Contributor"
means each individual or legal entity that creates, contributes to
the creation of, or owns Covered Software.
"License" shall mean the terms and conditions for use, reproduction, 1.2. "Contributor Version"
and distribution as defined by Sections 1 through 9 of this document. means the combination of the Contributions of others (if any) used
by a Contributor and that particular Contributor's Contribution.
"Licensor" shall mean the copyright owner or entity authorized by 1.3. "Contribution"
the copyright owner that is granting the License. means Covered Software of a particular Contributor.
"Legal Entity" shall mean the union of the acting entity and all 1.4. "Covered Software"
other entities that control, are controlled by, or are under common means Source Code Form to which the initial Contributor has attached
control with that entity. For the purposes of this definition, the notice in Exhibit A, the Executable Form of such Source Code
"control" means (i) the power, direct or indirect, to cause the Form, and Modifications of such Source Code Form, in each case
direction or management of such entity, whether by contract or including portions thereof.
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"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.
"Object" form shall mean any form resulting from mechanical (b) that the Covered Software was made available under the terms of
transformation or translation of a Source form, including but version 1.1 or earlier of the License, but not also under the
not limited to compiled object code, generated documentation, terms of a Secondary License.
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or 1.6. "Executable Form"
Object form, made available under the License, as indicated by a means any form of the work other than Source Code Form.
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object 1.7. "Larger Work"
form, that is based on (or derived from) the Work and for which the means a work that combines Covered Software with other material, in
editorial revisions, annotations, elaborations, or other modifications a separate file or files, that is not Covered Software.
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including 1.8. "License"
the original version of the Work and any modifications or additions means this document.
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity 1.9. "Licensable"
on behalf of whom a Contribution has been received by Licensor and means having the right to grant, to the maximum extent possible,
subsequently incorporated within the Work. whether at the time of the initial grant or subsequently, any and
all of the rights conveyed by this License.
2. Grant of Copyright License. Subject to the terms and conditions of 1.10. "Modifications"
this License, each Contributor hereby grants to You a perpetual, means any of the following:
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of (a) any file in Source Code Form that results from an addition to,
this License, each Contributor hereby grants to You a perpetual, deletion from, or modification of the contents of Covered
worldwide, non-exclusive, no-charge, royalty-free, irrevocable Software; or
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the (b) any new file in Source Code Form that contains any Covered
Work or Derivative Works thereof in any medium, with or without Software.
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or 1.11. "Patent Claims" of a Contributor
Derivative Works a copy of this License; and means any patent claim(s), including without limitation, method,
process, and apparatus claims, in any patent Licensable by such
Contributor that would be infringed, but for the grant of the
License, by the making, using, selling, offering for sale, having
made, import, or transfer of either its Contributions or its
Contributor Version.
(b) You must cause any modified files to carry prominent notices 1.12. "Secondary License"
stating that You changed the files; and means either the GNU General Public License, Version 2.0, the GNU
Lesser General Public License, Version 2.1, the GNU Affero General
Public License, Version 3.0, or any later versions of those
licenses.
(c) You must retain, in the Source form of any Derivative Works 1.13. "Source Code Form"
that You distribute, all copyright, patent, trademark, and means the form of the work preferred for making modifications.
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its 1.14. "You" (or "Your")
distribution, then any Derivative Works that You distribute must means an individual or a legal entity exercising rights under this
include a readable copy of the attribution notices contained License. For legal entities, "You" includes any entity that
within such NOTICE file, excluding those notices that do not controls, is controlled by, or is under common control with You. For
pertain to any part of the Derivative Works, in at least one purposes of this definition, "control" means (a) the power, direct
of the following places: within a NOTICE text file distributed or indirect, to cause the direction or management of such entity,
as part of the Derivative Works; within the Source form or whether by contract or otherwise, or (b) ownership of more than
documentation, if provided along with the Derivative Works; or, fifty percent (50%) of the outstanding shares or beneficial
within a display generated by the Derivative Works, if and ownership of such entity.
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and 2. License Grants and Conditions
may provide additional or different license terms and conditions --------------------------------
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise, 2.1. Grants
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade Each Contributor hereby grants You a world-wide, royalty-free,
names, trademarks, service marks, or product names of the Licensor, non-exclusive license:
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or (a) under intellectual property rights (other than patent or trademark)
agreed to in writing, Licensor provides the Work (and each Licensable by such Contributor to use, reproduce, make available,
Contributor provides its Contributions) on an "AS IS" BASIS, modify, display, perform, distribute, and otherwise exploit its
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or Contributions, either on an unmodified basis, with Modifications, or
implied, including, without limitation, any warranties or conditions as part of a Larger Work; and
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory, (b) under Patent Claims of such Contributor to make, use, sell, offer
whether in tort (including negligence), contract, or otherwise, for sale, have made, import, and otherwise transfer either its
unless required by applicable law (such as deliberate and grossly Contributions or its Contributor Version.
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing 2.2. Effective Date
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS The licenses granted in Section 2.1 with respect to any Contribution
become effective for each Contribution on the date the Contributor first
distributes such Contribution.
APPENDIX: How to apply the Apache License to your work. 2.3. Limitations on Grant Scope
To apply the Apache License to your work, attach the following The licenses granted in this Section 2 are the only rights granted under
boilerplate notice, with the fields enclosed by brackets "{}" this License. No additional rights or licenses will be implied from the
replaced with your own identifying information. (Don't include distribution or licensing of Covered Software under this License.
the brackets!) The text should be enclosed in the appropriate Notwithstanding Section 2.1(b) above, no patent license is granted by a
comment syntax for the file format. We also recommend that a Contributor:
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright {yyyy} {name of copyright owner} (a) for any code that a Contributor has removed from Covered Software;
or
Licensed under the Apache License, Version 2.0 (the "License"); (b) for infringements caused by: (i) Your and any other third party's
you may not use this file except in compliance with the License. modifications of Covered Software, or (ii) the combination of its
You may obtain a copy of the License at Contributions with other software (except as part of its Contributor
Version); or
http://www.apache.org/licenses/LICENSE-2.0 (c) under Patent Claims infringed by Covered Software in the absence of
its Contributions.
Unless required by applicable law or agreed to in writing, software This License does not grant any rights in the trademarks, service marks,
distributed under the License is distributed on an "AS IS" BASIS, or logos of any Contributor (except as may be necessary to comply with
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. the notice requirements in Section 3.4).
See the License for the specific language governing permissions and
limitations under the License. 2.4. Subsequent Licenses
No Contributor makes additional grants as a result of Your choice to
distribute the Covered Software under a subsequent version of this
License (see Section 10.2) or under the terms of a Secondary License (if
permitted under the terms of Section 3.3).
2.5. Representation
Each Contributor represents that the Contributor believes its
Contributions are its original creation(s) or it has sufficient rights
to grant the rights to its Contributions conveyed by this License.
2.6. Fair Use
This License is not intended to limit any rights You have under
applicable copyright doctrines of fair use, fair dealing, or other
equivalents.
2.7. Conditions
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
in Section 2.1.
3. Responsibilities
-------------------
3.1. Distribution of Source Form
All distribution of Covered Software in Source Code Form, including any
Modifications that You create or to which You contribute, must be under
the terms of this License. You must inform recipients that the Source
Code Form of the Covered Software is governed by the terms of this
License, and how they can obtain a copy of this License. You may not
attempt to alter or restrict the recipients' rights in the Source Code
Form.
3.2. Distribution of Executable Form
If You distribute Covered Software in Executable Form then:
(a) such Covered Software must also be made available in Source Code
Form, as described in Section 3.1, and You must inform recipients of
the Executable Form how they can obtain a copy of such Source Code
Form by reasonable means in a timely manner, at a charge no more
than the cost of distribution to the recipient; and
(b) You may distribute such Executable Form under the terms of this
License, or sublicense it under different terms, provided that the
license for the Executable Form does not attempt to limit or alter
the recipients' rights in the Source Code Form under this License.
3.3. Distribution of a Larger Work
You may create and distribute a Larger Work under terms of Your choice,
provided that You also comply with the requirements of this License for
the Covered Software. If the Larger Work is a combination of Covered
Software with a work governed by one or more Secondary Licenses, and the
Covered Software is not Incompatible With Secondary Licenses, this
License permits You to additionally distribute such Covered Software
under the terms of such Secondary License(s), so that the recipient of
the Larger Work may, at their option, further distribute the Covered
Software under the terms of either this License or such Secondary
License(s).
3.4. Notices
You may not remove or alter the substance of any license notices
(including copyright notices, patent notices, disclaimers of warranty,
or limitations of liability) contained within the Source Code Form of
the Covered Software, except that You may alter any license notices to
the extent required to remedy known factual inaccuracies.
3.5. Application of Additional Terms
You may choose to offer, and to charge a fee for, warranty, support,
indemnity or liability obligations to one or more recipients of Covered
Software. However, You may do so only on Your own behalf, and not on
behalf of any Contributor. You must make it absolutely clear that any
such warranty, support, indemnity, or liability obligation is offered by
You alone, and You hereby agree to indemnify every Contributor for any
liability incurred by such Contributor as a result of warranty, support,
indemnity or liability terms You offer. You may include additional
disclaimers of warranty and limitations of liability specific to any
jurisdiction.
4. Inability to Comply Due to Statute or Regulation
---------------------------------------------------
If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Software due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description must
be placed in a text file included with all distributions of the Covered
Software under this License. Except to the extent prohibited by statute
or regulation, such description must be sufficiently detailed for a
recipient of ordinary skill to be able to understand it.
5. Termination
--------------
5.1. The rights granted under this License will terminate automatically
if You fail to comply with any of its terms. However, if You become
compliant, then the rights granted under this License from a particular
Contributor are reinstated (a) provisionally, unless and until such
Contributor explicitly and finally terminates Your grants, and (b) on an
ongoing basis, if such Contributor fails to notify You of the
non-compliance by some reasonable means prior to 60 days after You have
come back into compliance. Moreover, Your grants from a particular
Contributor are reinstated on an ongoing basis if such Contributor
notifies You of the non-compliance by some reasonable means, this is the
first time You have received notice of non-compliance with this License
from such Contributor, and You become compliant prior to 30 days after
Your receipt of the notice.
5.2. If You initiate litigation against any entity by asserting a patent
infringement claim (excluding declaratory judgment actions,
counter-claims, and cross-claims) alleging that a Contributor Version
directly or indirectly infringes any patent, then the rights granted to
You by any and all Contributors for the Covered Software under Section
2.1 of this License shall terminate.
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
end user license agreements (excluding distributors and resellers) which
have been validly granted by You or Your distributors under this License
prior to termination shall survive termination.
************************************************************************
* *
* 6. Disclaimer of Warranty *
* ------------------------- *
* *
* Covered Software is provided under this License on an "as is" *
* basis, without warranty of any kind, either expressed, implied, or *
* statutory, including, without limitation, warranties that the *
* Covered Software is free of defects, merchantable, fit for a *
* particular purpose or non-infringing. The entire risk as to the *
* quality and performance of the Covered Software is with You. *
* Should any Covered Software prove defective in any respect, You *
* (not any Contributor) assume the cost of any necessary servicing, *
* repair, or correction. This disclaimer of warranty constitutes an *
* essential part of this License. No use of any Covered Software is *
* authorized under this License except under this disclaimer. *
* *
************************************************************************
************************************************************************
* *
* 7. Limitation of Liability *
* -------------------------- *
* *
* Under no circumstances and under no legal theory, whether tort *
* (including negligence), contract, or otherwise, shall any *
* Contributor, or anyone who distributes Covered Software as *
* permitted above, be liable to You for any direct, indirect, *
* special, incidental, or consequential damages of any character *
* including, without limitation, damages for lost profits, loss of *
* goodwill, work stoppage, computer failure or malfunction, or any *
* and all other commercial damages or losses, even if such party *
* shall have been informed of the possibility of such damages. This *
* limitation of liability shall not apply to liability for death or *
* personal injury resulting from such party's negligence to the *
* extent applicable law prohibits such limitation. Some *
* jurisdictions do not allow the exclusion or limitation of *
* incidental or consequential damages, so this exclusion and *
* limitation may not apply to You. *
* *
************************************************************************
8. Litigation
-------------
Any litigation relating to this License may be brought only in the
courts of a jurisdiction where the defendant maintains its principal
place of business and such litigation shall be governed by laws of that
jurisdiction, without reference to its conflict-of-law provisions.
Nothing in this Section shall prevent a party's ability to bring
cross-claims or counter-claims.
9. Miscellaneous
----------------
This License represents the complete agreement concerning the subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. Any law or regulation which provides
that the language of a contract shall be construed against the drafter
shall not be used to construe this License against a Contributor.
10. Versions of the License
---------------------------
10.1. New Versions
Mozilla Foundation is the license steward. Except as provided in Section
10.3, no one other than the license steward has the right to modify or
publish new versions of this License. Each version will be given a
distinguishing version number.
10.2. Effect of New Versions
You may distribute the Covered Software under the terms of the version
of the License under which You originally received the Covered Software,
or under the terms of any subsequent version published by the license
steward.
10.3. Modified Versions
If you create software not governed by this License, and you want to
create a new license for such software, you may create and use a
modified version of this License if you rename the license and remove
any references to the name of the license steward (except to note that
such modified license differs from this License).
10.4. Distributing Source Code Form that is Incompatible With Secondary
Licenses
If You choose to distribute Source Code Form that is Incompatible With
Secondary Licenses under the terms of this version of the License, the
notice described in Exhibit B of this License must be attached.
Exhibit A - Source Code Form License Notice
-------------------------------------------
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
If it is not possible or desirable to put the notice in a particular
file, then You may include the notice in a location (such as a LICENSE
file in a relevant directory) where a recipient would be likely to look
for such a notice.
You may add additional accurate notices of copyright ownership.
Exhibit B - "Incompatible With Secondary Licenses" Notice
---------------------------------------------------------
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.

View File

@ -62,15 +62,15 @@ Compile software:
lutin -C -P esignal-test esignal-sample lutin -C -P esignal-test esignal-sample
License (APACHE v2.0) License (MPL v2.0)
===================== =====================
Copyright esignal Edouard DUPIN Copyright esignal Edouard DUPIN
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Mozilla Public License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may 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
http://www.apache.org/licenses/LICENSE-2.0 https://www.mozilla.org/MPL/2.0
Unless required by applicable law or agreed to in writing, software 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,

View File

@ -26,16 +26,16 @@ Are there any licensing restrictions? {#esignal_mainpage_restriction}
ESIGNAL is **FREE software** and _all sub-library are FREE and staticly linkable !!!_ ESIGNAL is **FREE software** and _all sub-library are FREE and staticly linkable !!!_
License (APACHE-2.0) {#esignal_mainpage_license} License (MPL v2.0) {#esignal_mainpage_license}
==================== ==================
Copyright esignal Edouard DUPIN Copyright esignal Edouard DUPIN
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Mozilla Public License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may 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
<http://www.apache.org/licenses/LICENSE-2.0> <https://www.mozilla.org/MPL/2.0>
Unless required by applicable law or agreed to in writing, software 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,

View File

@ -13,7 +13,7 @@ Declaring a signal is really simple, just include the esignal file:
You can now declare your signals. We have basicly declare some basic signal type: You can now declare your signals. We have basicly declare some basic signal type:
- void - void
- bool - bool
- std::string / std::u32string - etk::String / etk::UString
- int8_t / int16_t / int32_t / int64_t - int8_t / int16_t / int32_t / int64_t
- uint8_t / uint16_t / uint32_t / uint64_t - uint8_t / uint16_t / uint32_t / uint64_t
- float / double - float / double

View File

@ -1,9 +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 <ememory/memory.hpp> #include <ememory/memory.hpp>
@ -18,53 +16,54 @@ void esignal::BaseInternal::setPeriodic(bool _state) {
m_periodic = _state; m_periodic = _state;
} }
const std::string& esignal::BaseInternal::getName() const { const etk::String& esignal::BaseInternal::getName() const {
return m_name; return m_name;
} }
void esignal::BaseInternal::setName(const std::string& _name) { void esignal::BaseInternal::setName(const etk::String& _name) {
m_name = _name; m_name = _name;
} }
const std::string& esignal::BaseInternal::getDescription() const { const etk::String& esignal::BaseInternal::getDescription() const {
return m_description; return m_description;
} }
void esignal::BaseInternal::setDescription(const std::string& _desc) { void esignal::BaseInternal::setDescription(const etk::String& _desc) {
m_description = _desc; m_description = _desc;
} }
esignal::Base::Base() : esignal::Base::Base() :
m_data(nullptr) { m_data(null) {
} }
esignal::Base::~Base() { esignal::Base::~Base() {
m_data.reset(); m_data.reset();
} }
const std::string& esignal::Base::getName() const { const etk::String& esignal::Base::getName() const {
if (m_data != nullptr) { if (m_data != null) {
return m_data->getName(); return m_data->getName();
} }
static std::string noValue; static etk::String noValue;
return noValue; return noValue;
} }
const std::string& esignal::Base::getDescription() const { const etk::String& esignal::Base::getDescription() const {
if (m_data != nullptr) { if (m_data != null) {
return m_data->getDescription(); return m_data->getDescription();
} }
static std::string noValue; static etk::String noValue;
return noValue; return noValue;
} }
void esignal::Base::setPeriodic(bool _state) { void esignal::Base::setPeriodic(bool _state) {
if (m_data != nullptr) { if (m_data != null) {
m_data->setPeriodic(_state); m_data->setPeriodic(_state);
} }
} }
std::ostream& esignal::operator <<(std::ostream& _os, const esignal::Base& _obj) { etk::Stream& esignal::operator <<(etk::Stream& _os, const esignal::Base& _obj) {
_os << _obj.getName(); _os << _obj.getName();
return _os; return _os;
} }

View File

@ -1,20 +1,17 @@
/** @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 <functional> #include <etk/Function.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
#include <esignal/debug.hpp> #include <esignal/debug.hpp>
#include <esignal/Base.hpp> #include <esignal/Base.hpp>
#include <functional> #include <etk/Function.hpp>
#include <type_traits> #include <etk/typeTrait.hpp>
#include <utility> #include <ethread/Mutex.hpp>
#include <mutex>
/** /**
* @brief esignal global interface for all signal implementation * @brief esignal global interface for all signal implementation
@ -22,20 +19,21 @@
namespace esignal { namespace esignal {
class BaseInternal : public ememory::EnableSharedFromThis<esignal::BaseInternal> { class BaseInternal : public ememory::EnableSharedFromThis<esignal::BaseInternal> {
public: public:
using ObserverConnection = std::function<void(size_t)>; //!< Define an Observer of the number of observer using ObserverConnection = etk::Function<void(size_t)>; //!< Define an Observer of the number of observer
protected: protected:
bool m_periodic; //!< The signal is periodic ==> no log with this signal ... (no really needed) bool m_periodic; //!< The signal is periodic ==> no log with this signal ... (no really needed)
static size_t s_uid; //!< global id of the signal (STATIC) static size_t s_uid; //!< global id of the signal (STATIC)
static int64_t s_uidSignalEmit; //!< global id to emit counting static int64_t s_uidSignalEmit; //!< global id to emit counting
ObserverConnection m_connectionObserver; //!< propriétéry of the connection handle basic ObserverConnection m_connectionObserver; //!< propriétéry of the connection handle basic
std::string m_name; //!< name of the signal. etk::String m_name; //!< name of the signal.
std::string m_description; //!< description of the signal. etk::String m_description; //!< description of the signal.
public: public:
/** /**
* @brief Basic constructor: * @brief Basic constructor:
* @param[in] _countObs Observer on the number of connection availlable * @param[in] _countObs Observer on the number of connection availlable
*/ */
BaseInternal(ObserverConnection _countObs) : BaseInternal(ObserverConnection _countObs) :
m_periodic(false),
m_connectionObserver(_countObs) { m_connectionObserver(_countObs) {
} }
@ -54,22 +52,22 @@ namespace esignal {
* @brief Get name of the signal. * @brief Get name of the signal.
* @return requested name. * @return requested name.
*/ */
const std::string& getName() const; const etk::String& getName() const;
/** /**
* @brief Set name of the signal. * @brief Set name of the signal.
* @param[in] _name new name. * @param[in] _name new name.
*/ */
void setName(const std::string& _name); void setName(const etk::String& _name);
/** /**
* @brief Get decription of the signal. * @brief Get decription of the signal.
* @return requested decription. * @return requested decription.
*/ */
const std::string& getDescription() const; const etk::String& getDescription() const;
/** /**
* @brief Set decription of the signal. * @brief Set decription of the signal.
* @param[in] _desc new decription. * @param[in] _desc new decription.
*/ */
void setDescription(const std::string& _desc); void setDescription(const etk::String& _desc);
/** /**
* @brief Tag the signal as periodic... * @brief Tag the signal as periodic...
* @param[in] _state state of the periodic element * @param[in] _state state of the periodic element
@ -120,12 +118,12 @@ namespace esignal {
* @brief Get name of the signal. * @brief Get name of the signal.
* @return requested name. * @return requested name.
*/ */
virtual const std::string& getName() const; virtual const etk::String& getName() const;
/** /**
* @brief Get decription of the signal. * @brief Get decription of the signal.
* @return requested decription. * @return requested decription.
*/ */
virtual const std::string& getDescription() const; virtual const etk::String& getDescription() const;
/** /**
* @brief Tag the signal as periodic... * @brief Tag the signal as periodic...
* @param[in] _state state of the periodic element * @param[in] _state state of the periodic element
@ -133,7 +131,7 @@ namespace esignal {
void setPeriodic(bool _state); void setPeriodic(bool _state);
}; };
//! @not-in-doc //! @not-in-doc
std::ostream& operator <<(std::ostream& _os, const esignal::Base& _obj); etk::Stream& operator <<(etk::Stream& _os, const esignal::Base& _obj);
#ifdef DEBUG #ifdef DEBUG
const char* logIndent(int32_t _iii); const char* logIndent(int32_t _iii);
#endif #endif

View File

@ -1,15 +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)
*/ */
#include <esignal/debug.hpp> #include <esignal/debug.hpp>
#include <esignal/Connection.hpp> #include <esignal/Connection.hpp>
esignal::Connection::Connection(): esignal::Connection::Connection():
m_data(nullptr), m_data(null),
m_uid(0) { m_uid(0) {
} }
@ -38,7 +36,7 @@ esignal::Connection& esignal::Connection::operator=(esignal::Connection&& _obj)
esignal::Connection::~Connection() { esignal::Connection::~Connection() {
ememory::SharedPtr<esignal::BaseInternal> ref = m_data.lock(); ememory::SharedPtr<esignal::BaseInternal> ref = m_data.lock();
if (ref == nullptr) { if (ref == null) {
return; return;
} }
ref->disconnect(m_uid); ref->disconnect(m_uid);
@ -48,7 +46,7 @@ esignal::Connection::~Connection() {
void esignal::Connection::disconnect() { void esignal::Connection::disconnect() {
ememory::SharedPtr<esignal::BaseInternal> ref = m_data.lock(); ememory::SharedPtr<esignal::BaseInternal> ref = m_data.lock();
if (ref == nullptr) { if (ref == null) {
return; return;
} }
ref->disconnect(m_uid); ref->disconnect(m_uid);

View File

@ -1,13 +1,11 @@
/** @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 <functional> #include <etk/Function.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
#include <esignal/debug.hpp> #include <esignal/debug.hpp>
#include <esignal/Base.hpp> #include <esignal/Base.hpp>

View File

@ -1,14 +1,12 @@
/** @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 <vector> #include <etk/Vector.hpp>
#include <map> #include <etk/Map.hpp>
#include <esignal/InterfaceData.hpp> #include <esignal/InterfaceData.hpp>
namespace esignal { namespace esignal {

View File

@ -1,9 +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 <ememory/memory.hpp> #include <ememory/memory.hpp>
@ -21,17 +19,17 @@ esignal::InterfaceData::~InterfaceData() {
// note this pointer is not allocated and not free at the end of the class // note this pointer is not allocated and not free at the end of the class
void esignal::InterfaceData::add(esignal::Base* _pointerOnSignal) { void esignal::InterfaceData::add(esignal::Base* _pointerOnSignal) {
if (_pointerOnSignal == nullptr) { if (_pointerOnSignal == null) {
ESIGNAL_ERROR("Try to link a nullptr parameters"); ESIGNAL_ERROR("Try to link a null parameters");
return; return;
} }
m_list.push_back(_pointerOnSignal); m_list.pushBack(_pointerOnSignal);
} }
void esignal::InterfaceData::remove(esignal::Base* _pointerOnSignal) { void esignal::InterfaceData::remove(esignal::Base* _pointerOnSignal) {
auto it = m_list.begin(); auto it = m_list.begin();
while (it != m_list.end()) { while (it != m_list.end()) {
if ( *it == nullptr if ( *it == null
|| *it == _pointerOnSignal) { || *it == _pointerOnSignal) {
it = m_list.erase(it); it = m_list.erase(it);
} else { } else {
@ -40,23 +38,23 @@ void esignal::InterfaceData::remove(esignal::Base* _pointerOnSignal) {
} }
} }
std::vector<std::string> esignal::InterfaceData::getAll() const { etk::Vector<etk::String> esignal::InterfaceData::getAll() const {
std::vector<std::string> out; etk::Vector<etk::String> out;
for (auto &it : m_list) { for (auto &it : m_list) {
if(it != nullptr) { if(it != null) {
out.push_back(it->getName()); out.pushBack(it->getName());
} }
} }
return out; return out;
} }
void esignal::InterfaceData::disconnect(const ememory::SharedPtr<void>& _object) { void esignal::InterfaceData::disconnect(const ememory::SharedPtr<void>& _object) {
if (_object == nullptr) { if (_object == null) {
ESIGNAL_ERROR("Input ERROR nullptr pointer Object ..."); ESIGNAL_ERROR("Input ERROR null pointer Object ...");
return; return;
} }
for(auto &it : m_list) { for(auto &it : m_list) {
if (it == nullptr) { if (it == null) {
continue; continue;
} }
it->disconnectShared(_object); it->disconnectShared(_object);

View File

@ -1,14 +1,12 @@
/** @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 <vector> #include <etk/Vector.hpp>
#include <map> #include <etk/Map.hpp>
namespace esignal { namespace esignal {
class Base; class Base;
@ -17,7 +15,7 @@ namespace esignal {
*/ */
class InterfaceData { class InterfaceData {
private: private:
std::vector<esignal::Base*> m_list; //!< list of availlable Parameters etk::Vector<esignal::Base*> m_list; //!< list of availlable Parameters
public: public:
/** /**
* @brief Constructor. * @brief Constructor.
@ -43,7 +41,7 @@ namespace esignal {
* @brief Get All the signal list: * @brief Get All the signal list:
* @return vector on all the signals names * @return vector on all the signals names
*/ */
std::vector<std::string> getAll() const; etk::Vector<etk::String> getAll() const;
/** /**
* @brief Remove binding on all event class. * @brief Remove binding on all event class.
* @param[in] _sharedPtr sharedPtr to unlink (no type needed ...). * @param[in] _sharedPtr sharedPtr to unlink (no type needed ...).

View File

@ -1,19 +1,16 @@
/** @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 <functional> #include <etk/Function.hpp>
#include <memory>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
#include <ememory/UniquePtr.hpp>
#include <esignal/debug.hpp> #include <esignal/debug.hpp>
#include <esignal/Base.hpp> #include <esignal/Base.hpp>
#include <esignal/Connection.hpp> #include <esignal/Connection.hpp>
#include <utility>
#include <esignal/Interface.hpp> #include <esignal/Interface.hpp>
namespace esignal { namespace esignal {
@ -21,7 +18,7 @@ namespace esignal {
template<class... T_ARGS> template<class... T_ARGS>
class SignalInternal : public esignal::BaseInternal { class SignalInternal : public esignal::BaseInternal {
public: public:
using Observer = std::function<void(const T_ARGS&...)>; //!< Define an Observer: function pointer using Observer = etk::Function<void(const T_ARGS&...)>; //!< Define an Observer: function pointer
protected: protected:
int32_t m_callInProgress; //!< know if we are in a recursive loop int32_t m_callInProgress; //!< know if we are in a recursive loop
public: public:
@ -67,7 +64,7 @@ namespace esignal {
virtual bool isSharedPtr(const ememory::SharedPtr<void>& _obj); virtual bool isSharedPtr(const ememory::SharedPtr<void>& _obj);
}; };
protected: protected:
std::vector<std::unique_ptr<Executor>> m_executors; //!< List of all executors. etk::Vector<ememory::UniquePtr<Executor>> m_executors; //!< List of all executors.
private: private:
/** /**
* @brief Executor specific to the Shared_ptr caller that does not want to worry about the removing of the signal. * @brief Executor specific to the Shared_ptr caller that does not want to worry about the removing of the signal.
@ -153,9 +150,9 @@ namespace esignal {
* @param[in] _name Static name of the signal. * @param[in] _name Static name of the signal.
* @param[in] _description Description of the signal. * @param[in] _description Description of the signal.
*/ */
Signal(esignal::BaseInternal::ObserverConnection _countObs=nullptr, Signal(esignal::BaseInternal::ObserverConnection _countObs=null,
const std::string& _name="", const etk::String& _name="",
const std::string& _description=""); const etk::String& _description="");
/** /**
* @brief Basic constructor with connection interface * @brief Basic constructor with connection interface
* @param[in] _signalInterfaceLink reference on the signal lister. * @param[in] _signalInterfaceLink reference on the signal lister.
@ -163,8 +160,8 @@ namespace esignal {
* @param[in] _description Description of the signal. * @param[in] _description Description of the signal.
*/ */
Signal(esignal::Interface* _signalInterfaceLink, Signal(esignal::Interface* _signalInterfaceLink,
const std::string& _name, const etk::String& _name,
const std::string& _description); const etk::String& _description);
/** /**
* @brief Basic constructor with connection observer * @brief Basic constructor with connection observer
* @param[in] _class Class which is associated the function to call. * @param[in] _class Class which is associated the function to call.
@ -174,20 +171,20 @@ namespace esignal {
*/ */
template<class CLASS_TYPE, template<class CLASS_TYPE,
class FUNC_TYPE, class FUNC_TYPE,
typename std::enable_if<std::is_base_of<esignal::Interface, CLASS_TYPE>::value typename etk::EnableIf<etk::IsBaseOf<esignal::Interface, CLASS_TYPE>::value
, int>::type = 0> , int>::type = 0>
Signal(CLASS_TYPE* _class, Signal(CLASS_TYPE* _class,
FUNC_TYPE _func, FUNC_TYPE _func,
const std::string& _name, const etk::String& _name,
const std::string& _description); const etk::String& _description);
template<class CLASS_TYPE, template<class CLASS_TYPE,
class FUNC_TYPE, class FUNC_TYPE,
typename std::enable_if<!std::is_base_of<esignal::Interface, CLASS_TYPE>::value typename etk::EnableIf<!etk::IsBaseOf<esignal::Interface, CLASS_TYPE>::value
, int>::type = 0> , int>::type = 0>
Signal(CLASS_TYPE* _class, Signal(CLASS_TYPE* _class,
FUNC_TYPE _func, FUNC_TYPE _func,
const std::string& _name="", const etk::String& _name="",
const std::string& _description=""); const etk::String& _description="");
//! @brief Copy constructor (REMOVED) //! @brief Copy constructor (REMOVED)
Signal(const Signal&) = delete; Signal(const Signal&) = delete;
/** /**
@ -219,11 +216,11 @@ namespace esignal {
*/ */
template< class OBSERVER_TYPE > template< class OBSERVER_TYPE >
esignal::Connection connect(OBSERVER_TYPE&& _observer) { esignal::Connection connect(OBSERVER_TYPE&& _observer) {
if (m_data == nullptr) { if (m_data == null) {
return esignal::Connection(); return esignal::Connection();
} }
ememory::SharedPtr<esignal::SignalInternal<T_ARGS...>> pointer = ememory::staticPointerCast<esignal::SignalInternal<T_ARGS...>>(m_data); ememory::SharedPtr<esignal::SignalInternal<T_ARGS...>> pointer = ememory::staticPointerCast<esignal::SignalInternal<T_ARGS...>>(m_data);
return pointer->connect(std::forward<OBSERVER_TYPE>(_observer)); return pointer->connect(etk::forward<OBSERVER_TYPE>(_observer));
} }
/** /**
* @brief Connect an function member on the signal. * @brief Connect an function member on the signal.
@ -236,11 +233,11 @@ namespace esignal {
esignal::Connection connect(CLASS_TYPE* _class, esignal::Connection connect(CLASS_TYPE* _class,
FUNC_TYPE _func, FUNC_TYPE _func,
FUNC_ARGS_TYPE... _args) { FUNC_ARGS_TYPE... _args) {
if (m_data == nullptr) { if (m_data == null) {
return esignal::Connection(); return esignal::Connection();
} }
ememory::SharedPtr<esignal::SignalInternal<T_ARGS...>> pointer = ememory::staticPointerCast<esignal::SignalInternal<T_ARGS...>>(m_data); ememory::SharedPtr<esignal::SignalInternal<T_ARGS...>> pointer = ememory::staticPointerCast<esignal::SignalInternal<T_ARGS...>>(m_data);
return pointer->connect(_class, _func, std::forward<FUNC_ARGS_TYPE>(_args)...); return pointer->connect(_class, _func, etk::forward<FUNC_ARGS_TYPE>(_args)...);
} }
/** /**
* @brief Connect an function member on the signal with the shared_ptr object. * @brief Connect an function member on the signal with the shared_ptr object.
@ -252,11 +249,11 @@ namespace esignal {
void connect(const ememory::SharedPtr<PARENT_CLASS_TYPE>& _class, void connect(const ememory::SharedPtr<PARENT_CLASS_TYPE>& _class,
void (CLASS_TYPE::*_func)(const T_ARGS&..., FUNC_ARGS_TYPE...), void (CLASS_TYPE::*_func)(const T_ARGS&..., FUNC_ARGS_TYPE...),
FUNC_ARGS_TYPE... _args) { FUNC_ARGS_TYPE... _args) {
if (m_data == nullptr) { if (m_data == null) {
return; return;
} }
ememory::SharedPtr<esignal::SignalInternal<T_ARGS...>> pointer = ememory::staticPointerCast<esignal::SignalInternal<T_ARGS...>>(m_data); ememory::SharedPtr<esignal::SignalInternal<T_ARGS...>> pointer = ememory::staticPointerCast<esignal::SignalInternal<T_ARGS...>>(m_data);
return pointer->connect(_class, _func, std::forward<FUNC_ARGS_TYPE>(_args)...); return pointer->connect(_class, _func, etk::forward<FUNC_ARGS_TYPE>(_args)...);
} }
public: public:
/** /**
@ -264,11 +261,11 @@ namespace esignal {
* @param[in] _args Argument data to emit. * @param[in] _args Argument data to emit.
*/ */
void emit(const T_ARGS&... _args) { void emit(const T_ARGS&... _args) {
if (m_data == nullptr) { if (m_data == null) {
return; return;
} }
ememory::SharedPtr<esignal::SignalInternal<T_ARGS...>> pointer = ememory::staticPointerCast<esignal::SignalInternal<T_ARGS...>>(m_data); ememory::SharedPtr<esignal::SignalInternal<T_ARGS...>> pointer = ememory::staticPointerCast<esignal::SignalInternal<T_ARGS...>>(m_data);
return pointer->emit(std::forward<const T_ARGS&>(_args)...); return pointer->emit(etk::forward<const T_ARGS&>(_args)...);
} }
public: public:
/** /**
@ -276,7 +273,7 @@ namespace esignal {
* @param[in] _obj Link with the object to check * @param[in] _obj Link with the object to check
*/ */
void disconnectShared(const ememory::SharedPtr<void>& _obj) override { void disconnectShared(const ememory::SharedPtr<void>& _obj) override {
if (m_data == nullptr) { if (m_data == null) {
return;; return;;
} }
m_data->disconnectShared(_obj); m_data->disconnectShared(_obj);
@ -286,7 +283,7 @@ namespace esignal {
* @return The count of observer. * @return The count of observer.
*/ */
size_t size() const { size_t size() const {
if (m_data == nullptr) { if (m_data == null) {
return 0; return 0;
} }
return m_data->size(); return m_data->size();
@ -297,7 +294,7 @@ namespace esignal {
* @return false No observers. * @return false No observers.
*/ */
bool empty() const { bool empty() const {
if (m_data == nullptr) { if (m_data == null) {
return true; return true;
} }
return m_data->empty(); return m_data->empty();
@ -306,7 +303,7 @@ namespace esignal {
* @brief Clear all connectd observers. * @brief Clear all connectd observers.
*/ */
void clear() { void clear() {
if (m_data == nullptr) { if (m_data == null) {
return; return;
} }
m_data->clear(); m_data->clear();
@ -319,10 +316,10 @@ template<class... T_ARGS>
template<class OBSERVER_TYPE > template<class OBSERVER_TYPE >
esignal::Connection esignal::SignalInternal<T_ARGS...>::connect(OBSERVER_TYPE&& _observer ) { esignal::Connection esignal::SignalInternal<T_ARGS...>::connect(OBSERVER_TYPE&& _observer ) {
ESIGNAL_DEBUG("esignal: '" << getName() << "' try connect: '" << getName() << "' (observer)"); ESIGNAL_DEBUG("esignal: '" << getName() << "' try connect: '" << getName() << "' (observer)");
std::unique_ptr<Executor> executer(new Executor(std::forward<OBSERVER_TYPE>(_observer))); ememory::UniquePtr<Executor> executer(ETK_NEW(Executor, etk::forward<OBSERVER_TYPE>(_observer)));
size_t uid = executer->m_uid; size_t uid = executer->m_uid;
m_executors.push_back(std::move(executer)); m_executors.pushBack(etk::move(executer));
if (m_connectionObserver!=nullptr) { if (m_connectionObserver!=null) {
m_connectionObserver(m_executors.size()); m_connectionObserver(m_executors.size());
} }
ESIGNAL_DEBUG(" '" << getName() << "' new count: " << m_executors.size()); ESIGNAL_DEBUG(" '" << getName() << "' new count: " << m_executors.size());
@ -335,16 +332,16 @@ esignal::Connection esignal::SignalInternal<T_ARGS...>::connect(CLASS_TYPE* _cla
FUNC_TYPE _func, FUNC_TYPE _func,
FUNC_ARGS_TYPE... _arg) { FUNC_ARGS_TYPE... _arg) {
ESIGNAL_DEBUG("esignal: '" << getName() << "' try connect: '" << getName() << "' (reference)"); ESIGNAL_DEBUG("esignal: '" << getName() << "' try connect: '" << getName() << "' (reference)");
if (_class == nullptr) { if (_class == null) {
ESIGNAL_ERROR(" '" << getName() << "' Class pointer in nullptr"); ESIGNAL_ERROR(" '" << getName() << "' Class pointer in null");
return esignal::Connection(); return esignal::Connection();
} }
std::unique_ptr<Executor> executer(new Executor([=](const T_ARGS& ... _argBase){ ememory::UniquePtr<Executor> executer(ETK_NEW(Executor, [=](const T_ARGS& ... _argBase){
(*_class.*_func)(_argBase..., _arg... ); (*_class.*_func)(_argBase..., _arg... );
})); }));
size_t uid = executer->m_uid; size_t uid = executer->m_uid;
m_executors.push_back(std::move(executer)); m_executors.pushBack(etk::move(executer));
if (m_connectionObserver != nullptr) { if (m_connectionObserver != null) {
m_connectionObserver(m_executors.size()); m_connectionObserver(m_executors.size());
} }
ESIGNAL_DEBUG(" '" << getName() << "' new count: " << m_executors.size()); ESIGNAL_DEBUG(" '" << getName() << "' new count: " << m_executors.size());
@ -357,22 +354,22 @@ void esignal::SignalInternal<T_ARGS...>::connect(const ememory::SharedPtr<PARENT
void (CLASS_TYPE::*_func)(const T_ARGS&..., FUNC_ARGS_TYPE...), void (CLASS_TYPE::*_func)(const T_ARGS&..., FUNC_ARGS_TYPE...),
FUNC_ARGS_TYPE... _args) { FUNC_ARGS_TYPE... _args) {
ESIGNAL_DEBUG("esignal: '" << getName() << "' try connect: '" << getName() << "' (weak pointer)"); ESIGNAL_DEBUG("esignal: '" << getName() << "' try connect: '" << getName() << "' (weak pointer)");
if (_class == nullptr) { if (_class == null) {
ESIGNAL_ERROR(" '" << getName() << "' Class pointer in nullptr"); ESIGNAL_ERROR(" '" << getName() << "' Class pointer in null");
return; return;
} }
ememory::SharedPtr<CLASS_TYPE> obj2 = ememory::dynamicPointerCast<CLASS_TYPE>(_class); ememory::SharedPtr<CLASS_TYPE> obj2 = ememory::dynamicPointerCast<CLASS_TYPE>(_class);
if (obj2 == nullptr) { if (obj2 == null) {
ESIGNAL_ERROR("Can not connect signal ..."); ESIGNAL_ERROR("Can not connect signal ...");
return; return;
} }
CLASS_TYPE* directPointer = obj2.get(); CLASS_TYPE* directPointer = obj2.get();
std::unique_ptr<ExecutorShared> executer(new ExecutorShared(_class, [=]( const T_ARGS& ... _argBase){ ememory::UniquePtr<Executor> executer(ETK_NEW(ExecutorShared, _class, [=]( const T_ARGS& ... _argBase){
// TODO : Check if compilator does not use the shared ptr ... // TODO : Check if compilator does not use the shared ptr ...
(*directPointer.*_func)(_argBase..., _args... ); (*directPointer.*_func)(_argBase..., _args... );
})); }));
m_executors.push_back(std::move(executer)); m_executors.pushBack(etk::move(executer));
if (m_connectionObserver!=nullptr) { if (m_connectionObserver!=null) {
m_connectionObserver(m_executors.size()); m_connectionObserver(m_executors.size());
} }
ESIGNAL_DEBUG(" '" << getName() << "' new count: " << m_executors.size()); ESIGNAL_DEBUG(" '" << getName() << "' new count: " << m_executors.size());
@ -381,46 +378,46 @@ void esignal::SignalInternal<T_ARGS...>::connect(const ememory::SharedPtr<PARENT
template<class... T_ARGS> template<class... T_ARGS>
template<class CLASS_TYPE, template<class CLASS_TYPE,
class FUNC_TYPE, class FUNC_TYPE,
typename std::enable_if<std::is_base_of<esignal::Interface, CLASS_TYPE>::value typename etk::EnableIf<etk::IsBaseOf<esignal::Interface, CLASS_TYPE>::value
, int>::type> , int>::type>
esignal::Signal<T_ARGS...>::Signal(CLASS_TYPE* _class, esignal::Signal<T_ARGS...>::Signal(CLASS_TYPE* _class,
FUNC_TYPE _func, FUNC_TYPE _func,
const std::string& _name, const etk::String& _name,
const std::string& _description): const etk::String& _description):
m_signalInterfaceLink(nullptr) { m_signalInterfaceLink(null) {
// nothing to do // nothing to do
if (_func != nullptr) { if (_func != null) {
esignal::Base::m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>([=](size_t _val){(*_class.*_func)(_val);}); esignal::Base::m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>([=](size_t _val){(*_class.*_func)(_val);});
} else { } else {
esignal::Base::m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>(nullptr); esignal::Base::m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>(null);
} }
if (esignal::Base::m_data != nullptr) { if (esignal::Base::m_data != null) {
esignal::Base::m_data->setName(_name); esignal::Base::m_data->setName(_name);
esignal::Base::m_data->setDescription(_description); esignal::Base::m_data->setDescription(_description);
} }
m_signalInterfaceLink = _class; m_signalInterfaceLink = _class;
// add a reference on the current signal ... // add a reference on the current signal ...
if (m_signalInterfaceLink != nullptr) { if (m_signalInterfaceLink != null) {
m_signalInterfaceLink->signals.add(this); m_signalInterfaceLink->signals.add(this);
} }
} }
template<class... T_ARGS> template<class... T_ARGS>
template<class CLASS_TYPE, template<class CLASS_TYPE,
class FUNC_TYPE, class FUNC_TYPE,
typename std::enable_if<!std::is_base_of<esignal::Interface, CLASS_TYPE>::value typename etk::EnableIf<!etk::IsBaseOf<esignal::Interface, CLASS_TYPE>::value
, int>::type> , int>::type>
esignal::Signal<T_ARGS...>::Signal(CLASS_TYPE* _class, esignal::Signal<T_ARGS...>::Signal(CLASS_TYPE* _class,
FUNC_TYPE _func, FUNC_TYPE _func,
const std::string& _name, const etk::String& _name,
const std::string& _description): const etk::String& _description):
m_signalInterfaceLink(nullptr) { m_signalInterfaceLink(null) {
// nothing to do // nothing to do
if (_func != nullptr) { if (_func != null) {
esignal::Base::m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>([=](size_t _val){(*_class.*_func)(_val);}); esignal::Base::m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>([=](size_t _val){(*_class.*_func)(_val);});
} else { } else {
esignal::Base::m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>(nullptr); esignal::Base::m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>(null);
} }
if (esignal::Base::m_data != nullptr) { if (esignal::Base::m_data != null) {
esignal::Base::m_data->setName(_name); esignal::Base::m_data->setName(_name);
esignal::Base::m_data->setDescription(_description); esignal::Base::m_data->setDescription(_description);
} }

View File

@ -1,9 +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 <esignal/debug.hpp> #include <esignal/debug.hpp>

View File

@ -1,9 +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

View File

@ -1,23 +1,25 @@
/** @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 <esignal/details/Signal.hxx> #include <esignal/details/Signal.hxx>
#include <etk/types.hpp> #include <etk/types.hpp>
#include <etk/math/Vector2D.hpp> #include <etk/math/Vector2D.hpp>
#include <etk/math/Vector3D.hpp> #include <etk/math/Vector3D.hpp>
#include <etk/math/Quaternion.hpp>
#include <etk/math/Transform3D.hpp>
#include <etk/Color.hpp> #include <etk/Color.hpp>
#include <etk/path/Path.hpp>
#include <etk/uri/Uri.hpp>
// void generic signal // void generic signal
ESIGNAL_DECLARE_SIGNAL(); ESIGNAL_DECLARE_SIGNAL();
// std generic signal // std generic signal
ESIGNAL_DECLARE_SIGNAL(bool); ESIGNAL_DECLARE_SIGNAL(bool);
ESIGNAL_DECLARE_SIGNAL(std::string); ESIGNAL_DECLARE_SIGNAL(etk::String);
#if __CPP_VERSION__ >= 2011 #if __CPP_VERSION__ >= 2011
ESIGNAL_DECLARE_SIGNAL(std::u32string); ESIGNAL_DECLARE_SIGNAL(etk::UString);
#endif #endif
ESIGNAL_DECLARE_SIGNAL(int64_t); ESIGNAL_DECLARE_SIGNAL(int64_t);
@ -32,19 +34,35 @@ ESIGNAL_DECLARE_SIGNAL(uint8_t);
ESIGNAL_DECLARE_SIGNAL(float); ESIGNAL_DECLARE_SIGNAL(float);
ESIGNAL_DECLARE_SIGNAL(double); ESIGNAL_DECLARE_SIGNAL(double);
// etk generic vetor 2D // etk generic vector 2D
ESIGNAL_DECLARE_SIGNAL(vec2); ESIGNAL_DECLARE_SIGNAL(vec2);
ESIGNAL_DECLARE_SIGNAL(bvec2); ESIGNAL_DECLARE_SIGNAL(bvec2);
ESIGNAL_DECLARE_SIGNAL(ivec2); ESIGNAL_DECLARE_SIGNAL(ivec2);
ESIGNAL_DECLARE_SIGNAL(uivec2); ESIGNAL_DECLARE_SIGNAL(uivec2);
// etk generic vetor 3D // etk generic vector 3D
ESIGNAL_DECLARE_SIGNAL(vec3); ESIGNAL_DECLARE_SIGNAL(vec3);
ESIGNAL_DECLARE_SIGNAL(bvec3); ESIGNAL_DECLARE_SIGNAL(bvec3);
ESIGNAL_DECLARE_SIGNAL(ivec3); ESIGNAL_DECLARE_SIGNAL(ivec3);
ESIGNAL_DECLARE_SIGNAL(uivec3); ESIGNAL_DECLARE_SIGNAL(uivec3);
// etk generic 3D elements
ESIGNAL_DECLARE_SIGNAL(etk::Quaternion);
ESIGNAL_DECLARE_SIGNAL(etk::Transform3D);
// etk generic color // etk generic color
ESIGNAL_DECLARE_SIGNAL(etk::Color<unsigned char,4>); ESIGNAL_DECLARE_SIGNAL(etk::Color<unsigned char,4>);
ESIGNAL_DECLARE_SIGNAL(etk::Color<unsigned char,3>); ESIGNAL_DECLARE_SIGNAL(etk::Color<unsigned char,3>);
ESIGNAL_DECLARE_SIGNAL(etk::Color<float,4>); ESIGNAL_DECLARE_SIGNAL(etk::Color<float,4>);
ESIGNAL_DECLARE_SIGNAL(etk::Color<float,3>); ESIGNAL_DECLARE_SIGNAL(etk::Color<float,3>);
ESIGNAL_DECLARE_SIGNAL(etk::Path);
ESIGNAL_DECLARE_SIGNAL(etk::Uri);
#ifdef ESIGNAL_BUILD_WITH_ECHRONO
#include <echrono/Clock.hpp>
#include <echrono/Duration.hpp>
#include <echrono/Steady.hpp>
#include <echrono/Time.hpp>
ESIGNAL_DECLARE_SIGNAL(echrono::Clock);
ESIGNAL_DECLARE_SIGNAL(echrono::Duration);
ESIGNAL_DECLARE_SIGNAL(echrono::Steady);
ESIGNAL_DECLARE_SIGNAL(echrono::Time);
#endif

View File

@ -1,9 +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
@ -11,20 +9,20 @@
template<class... T_ARGS> template<class... T_ARGS>
esignal::Signal<T_ARGS...>::~Signal() { esignal::Signal<T_ARGS...>::~Signal() {
if (m_signalInterfaceLink != nullptr) { if (m_signalInterfaceLink != null) {
m_signalInterfaceLink->signals.remove(this); m_signalInterfaceLink->signals.remove(this);
} }
} }
template<typename... T_ARGS> template<typename... T_ARGS>
esignal::Signal<T_ARGS...>::Signal(esignal::BaseInternal::ObserverConnection _countObs, esignal::Signal<T_ARGS...>::Signal(esignal::BaseInternal::ObserverConnection _countObs,
const std::string& _name, const etk::String& _name,
const std::string& _description): const etk::String& _description):
esignal::Base(), esignal::Base(),
m_signalInterfaceLink(nullptr) { m_signalInterfaceLink(null) {
// create internal data assiciated: // create internal data assiciated:
m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>(std::move(_countObs)); m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>(etk::move(_countObs));
if (esignal::Base::m_data != nullptr) { if (esignal::Base::m_data != null) {
esignal::Base::m_data->setName(_name); esignal::Base::m_data->setName(_name);
esignal::Base::m_data->setDescription(_description); esignal::Base::m_data->setDescription(_description);
} }
@ -32,17 +30,17 @@ esignal::Signal<T_ARGS...>::Signal(esignal::BaseInternal::ObserverConnection _co
template<class... T_ARGS> template<class... T_ARGS>
esignal::Signal<T_ARGS...>::Signal(esignal::Interface* _signalInterfaceLink, esignal::Signal<T_ARGS...>::Signal(esignal::Interface* _signalInterfaceLink,
const std::string& _name, const etk::String& _name,
const std::string& _description): const etk::String& _description):
m_signalInterfaceLink(_signalInterfaceLink) { m_signalInterfaceLink(_signalInterfaceLink) {
// create internal data assiciated: // create internal data assiciated:
m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>(nullptr); m_data = ememory::makeShared<esignal::SignalInternal<T_ARGS...>>(null);
if (esignal::Base::m_data != nullptr) { if (esignal::Base::m_data != null) {
esignal::Base::m_data->setName(_name); esignal::Base::m_data->setName(_name);
esignal::Base::m_data->setDescription(_description); esignal::Base::m_data->setDescription(_description);
} }
// add a reference on the current signal ... // add a reference on the current signal ...
if (m_signalInterfaceLink != nullptr) { if (m_signalInterfaceLink != null) {
m_signalInterfaceLink->signals.add(this); m_signalInterfaceLink->signals.add(this);
} }
} }
@ -69,7 +67,7 @@ void esignal::SignalInternal<T_ARGS...>::emit(const T_ARGS&... _args) {
bool haveRemove = false; bool haveRemove = false;
auto it = m_executors.begin(); auto it = m_executors.begin();
while (it != m_executors.end()) { while (it != m_executors.end()) {
if ( *it == nullptr if ( *it == null
|| (*it)->m_removed == true) { || (*it)->m_removed == true) {
it = m_executors.erase(it); it = m_executors.erase(it);
haveRemove = true; haveRemove = true;
@ -78,7 +76,7 @@ void esignal::SignalInternal<T_ARGS...>::emit(const T_ARGS&... _args) {
++it; ++it;
} }
if (haveRemove == true) { if (haveRemove == true) {
if (m_connectionObserver!=nullptr) { if (m_connectionObserver!=null) {
m_connectionObserver(m_executors.size()); m_connectionObserver(m_executors.size());
} }
} }
@ -94,7 +92,7 @@ void esignal::SignalInternal<T_ARGS...>::removeIfPossible() {
bool haveRemove = false; bool haveRemove = false;
auto it = m_executors.begin(); auto it = m_executors.begin();
while (it != m_executors.end()) { while (it != m_executors.end()) {
if ( *it == nullptr if ( *it == null
|| (*it)->m_removed == true) { || (*it)->m_removed == true) {
it = m_executors.erase(it); it = m_executors.erase(it);
haveRemove = true; haveRemove = true;
@ -103,7 +101,7 @@ void esignal::SignalInternal<T_ARGS...>::removeIfPossible() {
++it; ++it;
} }
if (haveRemove == true) { if (haveRemove == true) {
if (m_connectionObserver!=nullptr) { if (m_connectionObserver!=null) {
m_connectionObserver(m_executors.size()); m_connectionObserver(m_executors.size());
} }
} }
@ -154,7 +152,7 @@ esignal::SignalInternal<T_ARGS...>::Executor::Executor(Observer&& _observer):
m_removed(false), m_removed(false),
m_uid(0) { m_uid(0) {
m_uid = s_uid++; m_uid = s_uid++;
m_observer = std::move(_observer); m_observer = etk::move(_observer);
} }
template<typename... T_ARGS> template<typename... T_ARGS>
@ -179,7 +177,7 @@ bool esignal::SignalInternal<T_ARGS...>::Executor::isSharedPtr(const ememory::Sh
template<typename... T_ARGS> template<typename... T_ARGS>
esignal::SignalInternal<T_ARGS...>::ExecutorShared::ExecutorShared(ememory::WeakPtr<void> _object, Observer&& _observer) : esignal::SignalInternal<T_ARGS...>::ExecutorShared::ExecutorShared(ememory::WeakPtr<void> _object, Observer&& _observer) :
Executor(std::move(_observer)), Executor(etk::move(_observer)),
m_object(_object) { m_object(_object) {
} }
@ -188,7 +186,7 @@ template<typename... T_ARGS>
void esignal::SignalInternal<T_ARGS...>::ExecutorShared::emit(const T_ARGS&... _values) { void esignal::SignalInternal<T_ARGS...>::ExecutorShared::emit(const T_ARGS&... _values) {
// TODO: maybe an error if the object is not manage by the same thread. // TODO: maybe an error if the object is not manage by the same thread.
ememory::SharedPtr<void> destObject = m_object.lock(); ememory::SharedPtr<void> destObject = m_object.lock();
if (destObject == nullptr) { if (destObject == null) {
Executor::m_removed = true; Executor::m_removed = true;
return; return;
} }
@ -205,7 +203,7 @@ void esignal::SignalInternal<T_ARGS...>::ExecutorShared::emit(const T_ARGS&... _
template<typename... T_ARGS> template<typename... T_ARGS>
bool esignal::SignalInternal<T_ARGS...>::ExecutorShared::isSharedPtr(const ememory::SharedPtr<void>& _obj) { bool esignal::SignalInternal<T_ARGS...>::ExecutorShared::isSharedPtr(const ememory::SharedPtr<void>& _obj) {
ememory::SharedPtr<void> destObject = m_object.lock(); ememory::SharedPtr<void> destObject = m_object.lock();
if (destObject == nullptr) { if (destObject == null) {
return true; return true;
} }
if (destObject == _obj) { if (destObject == _obj) {

View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.debug as debug import realog.debug as debug
import lutin.tools as tools import lutin.tools as tools
def get_type(): def get_type():
@ -12,7 +12,7 @@ def get_desc():
return "e-signal sample 1" return "e-signal sample 1"
def get_licence(): def get_licence():
return "APACHE-2" return "MPL-2"
def get_compagny_type(): def get_compagny_type():
return "com" return "com"

View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.debug as debug import realog.debug as debug
import lutin.tools as tools import lutin.tools as tools
@ -13,7 +13,7 @@ def get_desc():
return "e-signal test software" return "e-signal test software"
def get_licence(): def get_licence():
return "APACHE-2" return "MPL-2"
def get_compagny_type(): def get_compagny_type():
return "com" return "com"
@ -37,7 +37,7 @@ def configure(target, my_module):
]) ])
my_module.add_depend([ my_module.add_depend([
'esignal', 'esignal',
'gtest', 'etest',
'test-debug' 'test-debug'
]) ])
return True return True

View File

@ -1,6 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.tools as tools import lutin.tools as tools
import lutin.debug as debug import realog.debug as debug
def get_type(): def get_type():
@ -10,7 +10,7 @@ def get_desc():
return "esignal is signal management for all class" return "esignal is signal management for all class"
def get_licence(): def get_licence():
return "APACHE-2" return "MPL-2"
def get_compagny_type(): def get_compagny_type():
return "com" return "com"
@ -51,6 +51,7 @@ def configure(target, my_module):
my_module.add_flag('c++', [ my_module.add_flag('c++', [
"-DESIGNAL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" "-DESIGNAL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\""
]) ])
my_module.add_optionnal_depend('echrono', compilation_flags=["c++", "-DESIGNAL_BUILD_WITH_ECHRONO"])
my_module.add_tools(['esignal-test']) my_module.add_tools(['esignal-test'])
return True return True

View File

@ -3,7 +3,7 @@
* *
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* *
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#include <etk/etk.hpp> #include <etk/etk.hpp>
#include <test-debug/debug.hpp> #include <test-debug/debug.hpp>
@ -22,7 +22,7 @@ void declareSignals() {
//! [esignal_sample_declare_void] //! [esignal_sample_declare_void]
//! [esignal_sample_declare_string] //! [esignal_sample_declare_string]
esignal::Signal<std::string> signalString; esignal::Signal<etk::String> signalString;
//! [esignal_sample_declare_string] //! [esignal_sample_declare_string]
} }
@ -71,7 +71,7 @@ class TmpClass {
void localCallBack(const int32_t& _val) { void localCallBack(const int32_t& _val) {
TEST_PRINT("Callback Local the value is : " << _val); TEST_PRINT("Callback Local the value is : " << _val);
} }
void localCallBackSecond(const int32_t& _val, const std::string& _otherValue) { void localCallBackSecond(const int32_t& _val, const etk::String& _otherValue) {
TEST_PRINT("Callback 2 Local the value is : " << _val << " with perso: '" << _otherValue << "'"); TEST_PRINT("Callback 2 Local the value is : " << _val << " with perso: '" << _otherValue << "'");
} }
}; };
@ -114,12 +114,12 @@ void sharedConnection() {
void newSignal() { void newSignal() {
// Declare new signal // Declare new signal
//! [esignal_sample_new_declare] //! [esignal_sample_new_declare]
esignal::Signal<int32_t, std::string> signalCustum; esignal::Signal<int32_t, etk::String> signalCustum;
//! [esignal_sample_new_declare] //! [esignal_sample_new_declare]
// Connect a lambda // Connect a lambda
//! [esignal_sample_new_lambda] //! [esignal_sample_new_lambda]
esignal::Connection con2 = signalCustum.connect( esignal::Connection con2 = signalCustum.connect(
[](int32_t _val, std::string _val2) { [](int32_t _val, etk::String _val2) {
TEST_PRINT("lambda callback: " << _val << " vel2=" << _val2); TEST_PRINT("lambda callback: " << _val << " vel2=" << _val2);
}); });
//! [esignal_sample_new_lambda] //! [esignal_sample_new_lambda]
@ -132,7 +132,7 @@ void newSignal() {
// do it in a single C++: Implementation of signal // do it in a single C++: Implementation of signal
//! [esignal_sample_new_register] //! [esignal_sample_new_register]
#include <esignal/details/Signal.hxx> #include <esignal/details/Signal.hxx>
ESIGNAL_DECLARE_SIGNAL(int32_t, std::string); ESIGNAL_DECLARE_SIGNAL(int32_t, etk::String);
//! [esignal_sample_new_register] //! [esignal_sample_new_register]
//! [esignal_sample_new] //! [esignal_sample_new]

View File

@ -3,12 +3,12 @@
* *
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* *
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#include <esignal/details/Signal.hxx> #include <esignal/details/Signal.hxx>
#include <etk/types.hpp> #include <etk/types.hpp>
ESIGNAL_DECLARE_SIGNAL(int32_t, std::string); ESIGNAL_DECLARE_SIGNAL(int32_t, etk::String);

View File

@ -3,20 +3,19 @@
* *
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* *
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#define NAME "Empty" #define NAME "Empty"
#include <etk/types.hpp> #include <etk/types.hpp>
#include <etk/etk.hpp> #include <etk/etk.hpp>
#include <test-debug/debug.hpp> #include <test-debug/debug.hpp>
#include <gtest/gtest.h> #include <etest/etest.hpp>
int main(int _argc, const char *_argv[]) { int main(int _argc, const char *_argv[]) {
::testing::InitGoogleTest(&_argc, const_cast<char **>(_argv)); etest::init(_argc, _argv);
etk::init(_argc, _argv);
for (int32_t iii=0; iii<_argc ; ++iii) { for (int32_t iii=0; iii<_argc ; ++iii) {
std::string data = _argv[iii]; etk::String data = _argv[iii];
if ( data == "-h" if ( data == "-h"
|| data == "--help") { || data == "--help") {
TEST_PRINT("esignal-test - help : "); TEST_PRINT("esignal-test - help : ");

View File

@ -3,11 +3,11 @@
* *
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* *
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#define NAME "SingleArg" #define NAME "SingleArg"
#include <gtest/gtest.h> #include <etest/etest.hpp>
#include <esignal/Signal.hpp> #include <esignal/Signal.hpp>
#include <esignal/Interface.hpp> #include <esignal/Interface.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
@ -17,7 +17,7 @@
class testISignal : public esignal::Interface { class testISignal : public esignal::Interface {
public: public:
esignal::Signal<int32_t> m_signalInt; esignal::Signal<int32_t> m_signalInt;
esignal::Signal<std::string> m_signalString; esignal::Signal<etk::String> m_signalString;
esignal::Signal<float> m_signalFloat; esignal::Signal<float> m_signalFloat;
public: public:
size_t m_count; size_t m_count;
@ -37,10 +37,10 @@ TEST(test_isignal_counter, localbasicCounter1) {
testISignal localClass; testISignal localClass;
EXPECT_EQ(localClass.m_signalString.size(), 0); EXPECT_EQ(localClass.m_signalString.size(), 0);
EXPECT_EQ(localClass.m_signalString.empty(), true); EXPECT_EQ(localClass.m_signalString.empty(), true);
esignal::Connection connection1 = localClass.m_signalString.connect([=](std::string){}); esignal::Connection connection1 = localClass.m_signalString.connect([=](etk::String){});
EXPECT_EQ(localClass.m_signalString.size(), 1); EXPECT_EQ(localClass.m_signalString.size(), 1);
EXPECT_EQ(localClass.m_signalString.empty(), false); EXPECT_EQ(localClass.m_signalString.empty(), false);
esignal::Connection connection2 = localClass.m_signalString.connect([=](std::string){}); esignal::Connection connection2 = localClass.m_signalString.connect([=](etk::String){});
EXPECT_EQ(localClass.m_signalString.size(), 2); EXPECT_EQ(localClass.m_signalString.size(), 2);
EXPECT_EQ(localClass.m_signalString.empty(), false); EXPECT_EQ(localClass.m_signalString.empty(), false);
connection1.disconnect(); connection1.disconnect();
@ -96,16 +96,16 @@ class testCallbackIShared : public ememory::EnableSharedFromThis<testCallbackISh
TEST(test_isignal_counter, localbasicInterfaceGetListSignal) { TEST(test_isignal_counter, localbasicInterfaceGetListSignal) {
testISignal localClass; testISignal localClass;
std::vector<std::string> list; etk::Vector<etk::String> list;
list.push_back("int"); list.pushBack("int");
list.push_back("string"); list.pushBack("string");
list.push_back("float"); list.pushBack("float");
EXPECT_EQ(localClass.signals.getAll(), list); EXPECT_EQ(localClass.signals.getAll(), list);
} }
TEST(test_isignal_counter, localbasicInterfaceDisconnectNullPtr) { TEST(test_isignal_counter, localbasicInterfaceDisconnectNullPtr) {
testISignal localClass; testISignal localClass;
localClass.signals.disconnect(nullptr); localClass.signals.disconnect(null);
} }
TEST(test_isignal_counter, localbasicInterfaceDisconnectSharedPtr) { TEST(test_isignal_counter, localbasicInterfaceDisconnectSharedPtr) {

View File

@ -3,11 +3,11 @@
* *
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* *
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#define NAME "SingleArg" #define NAME "SingleArg"
#include <gtest/gtest.h> #include <etest/etest.hpp>
#include <esignal/Signal.hpp> #include <esignal/Signal.hpp>
#include <esignal/Interface.hpp> #include <esignal/Interface.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
@ -16,15 +16,15 @@
class testCallback { class testCallback {
public: public:
int32_t m_int32; int32_t m_int32;
std::string m_string; etk::String m_string;
bool m_void; bool m_void;
testCallback() { testCallback() {
m_emptyFunctor = nullptr; m_emptyFunctor = null;
m_void = false; m_void = false;
m_int32 = 0; m_int32 = 0;
m_string = ""; m_string = "";
} }
using stupidFunctor = std::function<void()>; using stupidFunctor = etk::Function<void()>;
stupidFunctor m_emptyFunctor; stupidFunctor m_emptyFunctor;
@ -40,30 +40,30 @@ class testCallback {
TEST_VERBOSE("event a=" << _a); TEST_VERBOSE("event a=" << _a);
m_int32 = _a; m_int32 = _a;
} }
void callbackString(std::string _b){ void callbackString(etk::String _b){
TEST_VERBOSE("event b=" << _b); TEST_VERBOSE("event b=" << _b);
m_string = _b; m_string = _b;
} }
void callbackConstString(const std::string& _b){ void callbackConstString(const etk::String& _b){
TEST_VERBOSE("event b=" << _b); TEST_VERBOSE("event b=" << _b);
m_string = _b; m_string = _b;
} }
void callbackIntString(int32_t _a, std::string _b){ void callbackIntString(int32_t _a, etk::String _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b); TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a; m_int32 = _a;
m_string = _b; m_string = _b;
} }
void callbackConstIntString(const int32_t& _a, const std::string& _b){ void callbackConstIntString(const int32_t& _a, const etk::String& _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b); TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a; m_int32 = _a;
m_string = _b; m_string = _b;
} }
void callbackMixedIntString(int32_t _a, const std::string& _b){ void callbackMixedIntString(int32_t _a, const etk::String& _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b); TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a; m_int32 = _a;
m_string = _b; m_string = _b;
} }
void callbackPolyargs(const int32_t& _a, const std::string& _b, char _char, int _int) { void callbackPolyargs(const int32_t& _a, const etk::String& _b, char _char, int _int) {
TEST_VERBOSE("event a=" << _a << " b=" << _b << " _char=" << _char << " _int=" << _int); TEST_VERBOSE("event a=" << _a << " b=" << _b << " _char=" << _char << " _int=" << _int);
m_int32 = _a + _int; m_int32 = _a + _int;
m_string = _b + _char; m_string = _b + _char;
@ -105,7 +105,7 @@ TEST(test_signal_class_func, localbasicNameDesc) {
} }
TEST(test_signal_class_func, localNullClass) { TEST(test_signal_class_func, localNullClass) {
testCallback* localClass = nullptr; testCallback* localClass = null;
esignal::Signal<> signal; esignal::Signal<> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
@ -168,7 +168,7 @@ TEST(test_signal_class_func, localFunctionConstInt32) {
TEST(test_signal_class_func, localFunctionString) { TEST(test_signal_class_func, localFunctionString) {
testCallback localClass; testCallback localClass;
esignal::Signal<std::string> signal; esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackString); esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackString);
@ -180,7 +180,7 @@ TEST(test_signal_class_func, localFunctionString) {
TEST(test_signal_class_func, localFunctionConstString) { TEST(test_signal_class_func, localFunctionConstString) {
testCallback localClass; testCallback localClass;
esignal::Signal<std::string> signal; esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackConstString); esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackConstString);
@ -192,7 +192,7 @@ TEST(test_signal_class_func, localFunctionConstString) {
TEST(test_signal_class_func, localFunctionIntString) { TEST(test_signal_class_func, localFunctionIntString) {
testCallback localClass; testCallback localClass;
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackIntString); esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackIntString);
@ -205,7 +205,7 @@ TEST(test_signal_class_func, localFunctionIntString) {
TEST(test_signal_class_func, localFunctionConstIntString) { TEST(test_signal_class_func, localFunctionConstIntString) {
testCallback localClass; testCallback localClass;
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackConstIntString); esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackConstIntString);
@ -218,7 +218,7 @@ TEST(test_signal_class_func, localFunctionConstIntString) {
TEST(test_signal_class_func, localFunctionMixedIntString) { TEST(test_signal_class_func, localFunctionMixedIntString) {
testCallback localClass; testCallback localClass;
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackMixedIntString); esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackMixedIntString);
@ -231,7 +231,7 @@ TEST(test_signal_class_func, localFunctionMixedIntString) {
TEST(test_signal_class_func, localFunctionConstIntStringPolyArg) { TEST(test_signal_class_func, localFunctionConstIntStringPolyArg) {
testCallback localClass; testCallback localClass;
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackPolyargs, 'c', 12365); esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackPolyargs, 'c', 12365);

View File

@ -3,11 +3,11 @@
* *
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* *
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#define NAME "SingleArg" #define NAME "SingleArg"
#include <gtest/gtest.h> #include <etest/etest.hpp>
#include <esignal/Signal.hpp> #include <esignal/Signal.hpp>
#include <esignal/Interface.hpp> #include <esignal/Interface.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
@ -15,7 +15,7 @@
class testCounter { class testCounter {
public: public:
esignal::Signal<std::string> m_signal; esignal::Signal<etk::String> m_signal;
public: public:
size_t m_int32; size_t m_int32;
testCounter(): testCounter():
@ -33,11 +33,11 @@ TEST(test_signal_counter, localbasicCounter) {
EXPECT_EQ(localClass.m_signal.size(), 0); EXPECT_EQ(localClass.m_signal.size(), 0);
EXPECT_EQ(localClass.m_signal.empty(), true); EXPECT_EQ(localClass.m_signal.empty(), true);
EXPECT_EQ(localClass.m_int32, 0); EXPECT_EQ(localClass.m_int32, 0);
esignal::Connection connection1 = localClass.m_signal.connect([=](std::string){}); esignal::Connection connection1 = localClass.m_signal.connect([=](etk::String){});
EXPECT_EQ(localClass.m_signal.size(), 1); EXPECT_EQ(localClass.m_signal.size(), 1);
EXPECT_EQ(localClass.m_signal.empty(), false); EXPECT_EQ(localClass.m_signal.empty(), false);
EXPECT_EQ(localClass.m_int32, 1); EXPECT_EQ(localClass.m_int32, 1);
esignal::Connection connection2 = localClass.m_signal.connect([=](std::string){}); esignal::Connection connection2 = localClass.m_signal.connect([=](etk::String){});
EXPECT_EQ(localClass.m_signal.size(), 2); EXPECT_EQ(localClass.m_signal.size(), 2);
EXPECT_EQ(localClass.m_signal.empty(), false); EXPECT_EQ(localClass.m_signal.empty(), false);
EXPECT_EQ(localClass.m_int32, 2); EXPECT_EQ(localClass.m_int32, 2);
@ -57,11 +57,11 @@ TEST(test_signal_counter, localbasicCopy) {
EXPECT_EQ(localClass.m_signal.size(), 0); EXPECT_EQ(localClass.m_signal.size(), 0);
EXPECT_EQ(localClass.m_signal.empty(), true); EXPECT_EQ(localClass.m_signal.empty(), true);
EXPECT_EQ(localClass.m_int32, 0); EXPECT_EQ(localClass.m_int32, 0);
esignal::Connection connection1 = localClass.m_signal.connect([=](std::string){}); esignal::Connection connection1 = localClass.m_signal.connect([=](etk::String){});
EXPECT_EQ(localClass.m_signal.size(), 1); EXPECT_EQ(localClass.m_signal.size(), 1);
EXPECT_EQ(localClass.m_signal.empty(), false); EXPECT_EQ(localClass.m_signal.empty(), false);
EXPECT_EQ(localClass.m_int32, 1); EXPECT_EQ(localClass.m_int32, 1);
esignal::Connection connection2 = std::move(connection1); esignal::Connection connection2 = etk::move(connection1);
EXPECT_EQ(localClass.m_signal.size(), 1); EXPECT_EQ(localClass.m_signal.size(), 1);
EXPECT_EQ(localClass.m_signal.empty(), false); EXPECT_EQ(localClass.m_signal.empty(), false);
EXPECT_EQ(localClass.m_int32, 1); EXPECT_EQ(localClass.m_int32, 1);
@ -81,7 +81,7 @@ TEST(test_signal_counter, localbasicCheckConnection) {
EXPECT_EQ(localClass.m_signal.size(), 0); EXPECT_EQ(localClass.m_signal.size(), 0);
EXPECT_EQ(localClass.m_signal.empty(), true); EXPECT_EQ(localClass.m_signal.empty(), true);
EXPECT_EQ(localClass.m_int32, 0); EXPECT_EQ(localClass.m_int32, 0);
esignal::Connection connection1 = localClass.m_signal.connect([=](std::string){}); esignal::Connection connection1 = localClass.m_signal.connect([=](etk::String){});
EXPECT_EQ(connection1.isConnected(), true); EXPECT_EQ(connection1.isConnected(), true);
connection1.disconnect(); connection1.disconnect();
EXPECT_EQ(connection1.isConnected(), false); EXPECT_EQ(connection1.isConnected(), false);

View File

@ -3,11 +3,11 @@
* *
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* *
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#define NAME "SingleArg" #define NAME "SingleArg"
#include <gtest/gtest.h> #include <etest/etest.hpp>
#include <esignal/Signal.hpp> #include <esignal/Signal.hpp>
#include <esignal/Interface.hpp> #include <esignal/Interface.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
@ -28,7 +28,7 @@ static auto callbackInt = [](int32_t _a){
TEST(test_signal_recursive, base) { TEST(test_signal_recursive, base) {
tmpRetInt32 = -1; tmpRetInt32 = -1;
signalll = new esignal::Signal<int32_t>(); signalll = ETK_NEW(esignal::Signal<int32_t>);
EXPECT_EQ(signalll->size(), 0); EXPECT_EQ(signalll->size(), 0);
EXPECT_EQ(signalll->empty(), true); EXPECT_EQ(signalll->empty(), true);
esignal::Connection connection1 = signalll->connect(callbackInt); esignal::Connection connection1 = signalll->connect(callbackInt);

View File

@ -3,11 +3,11 @@
* *
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* *
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#define NAME "SingleArg" #define NAME "SingleArg"
#include <gtest/gtest.h> #include <etest/etest.hpp>
#include <esignal/Signal.hpp> #include <esignal/Signal.hpp>
#include <esignal/Interface.hpp> #include <esignal/Interface.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
@ -16,10 +16,10 @@
class testCallbackShared : public ememory::EnableSharedFromThis<testCallbackShared> { class testCallbackShared : public ememory::EnableSharedFromThis<testCallbackShared> {
public: public:
int32_t m_int32; int32_t m_int32;
std::string m_string; etk::String m_string;
bool m_void; bool m_void;
testCallbackShared() { testCallbackShared() {
m_emptyFunctor = nullptr; m_emptyFunctor = null;
m_void = false; m_void = false;
m_int32 = 0; m_int32 = 0;
m_string = ""; m_string = "";
@ -27,7 +27,7 @@ class testCallbackShared : public ememory::EnableSharedFromThis<testCallbackShar
virtual ~testCallbackShared() { virtual ~testCallbackShared() {
} }
//using stupidFunctor = std::function<void()>; //using stupidFunctor = etk::Function<void()>;
using stupidFunctor = void(); using stupidFunctor = void();
@ -45,30 +45,30 @@ class testCallbackShared : public ememory::EnableSharedFromThis<testCallbackShar
TEST_VERBOSE("event a=" << _a); TEST_VERBOSE("event a=" << _a);
m_int32 = _a; m_int32 = _a;
} }
void callbackString(std::string _b) { void callbackString(etk::String _b) {
TEST_VERBOSE("event b=" << _b); TEST_VERBOSE("event b=" << _b);
m_string = _b; m_string = _b;
} }
void callbackConstString(const std::string& _b) { void callbackConstString(const etk::String& _b) {
TEST_VERBOSE("event b=" << _b); TEST_VERBOSE("event b=" << _b);
m_string = _b; m_string = _b;
} }
void callbackIntString(int32_t _a, std::string _b) { void callbackIntString(int32_t _a, etk::String _b) {
TEST_VERBOSE("event a=" << _a << " b=" << _b); TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a; m_int32 = _a;
m_string = _b; m_string = _b;
} }
void callbackConstIntString(const int32_t& _a, const std::string& _b) { void callbackConstIntString(const int32_t& _a, const etk::String& _b) {
TEST_VERBOSE("event a=" << _a << " b=" << _b); TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a; m_int32 = _a;
m_string = _b; m_string = _b;
} }
void callbackMixedIntString(int32_t _a, const std::string& _b) { void callbackMixedIntString(int32_t _a, const etk::String& _b) {
TEST_VERBOSE("event a=" << _a << " b=" << _b); TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a; m_int32 = _a;
m_string = _b; m_string = _b;
} }
void callbackPolyargs(const int32_t& _a, const std::string& _b, char _char, int _int) { void callbackPolyargs(const int32_t& _a, const etk::String& _b, char _char, int _int) {
TEST_VERBOSE("event a=" << _a << " b=" << _b << " _char=" << _char << " _int=" << _int); TEST_VERBOSE("event a=" << _a << " b=" << _b << " _char=" << _char << " _int=" << _int);
m_int32 = _a + _int; m_int32 = _a + _int;
m_string = _b + _char; m_string = _b + _char;
@ -149,7 +149,7 @@ TEST(test_signal_shared_ptr_func, localFunctionConstInt32) {
TEST(test_signal_shared_ptr_func, localFunctionString) { TEST(test_signal_shared_ptr_func, localFunctionString) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>(); ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<std::string> signal; esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
#if 0 #if 0
@ -165,7 +165,7 @@ TEST(test_signal_shared_ptr_func, localFunctionString) {
TEST(test_signal_shared_ptr_func, localFunctionConstString) { TEST(test_signal_shared_ptr_func, localFunctionConstString) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>(); ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<std::string> signal; esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
signal.connect(localClass, &testCallbackShared::callbackConstString); signal.connect(localClass, &testCallbackShared::callbackConstString);
@ -177,7 +177,7 @@ TEST(test_signal_shared_ptr_func, localFunctionConstString) {
TEST(test_signal_shared_ptr_func, localFunctionIntString) { TEST(test_signal_shared_ptr_func, localFunctionIntString) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>(); ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
#if 0 #if 0
@ -194,7 +194,7 @@ TEST(test_signal_shared_ptr_func, localFunctionIntString) {
TEST(test_signal_shared_ptr_func, localFunctionConstIntString) { TEST(test_signal_shared_ptr_func, localFunctionConstIntString) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>(); ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
signal.connect(localClass, &testCallbackShared::callbackConstIntString); signal.connect(localClass, &testCallbackShared::callbackConstIntString);
@ -207,7 +207,7 @@ TEST(test_signal_shared_ptr_func, localFunctionConstIntString) {
TEST(test_signal_shared_ptr_func, localFunctionMixedIntString) { TEST(test_signal_shared_ptr_func, localFunctionMixedIntString) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>(); ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
#if 0 #if 0
@ -225,7 +225,7 @@ TEST(test_signal_shared_ptr_func, localFunctionMixedIntString) {
TEST(test_signal_shared_ptr_func, localFunctionConstIntStringPolyArg) { TEST(test_signal_shared_ptr_func, localFunctionConstIntStringPolyArg) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>(); ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
signal.connect(localClass, &testCallbackShared::callbackPolyargs, 'c', 12365); signal.connect(localClass, &testCallbackShared::callbackPolyargs, 'c', 12365);
@ -238,7 +238,7 @@ TEST(test_signal_shared_ptr_func, localFunctionConstIntStringPolyArg) {
class testCallbackSharedHerited : public testCallbackShared { class testCallbackSharedHerited : public testCallbackShared {
public: public:
void callbackHerited(const int32_t& _a, const std::string& _b) { void callbackHerited(const int32_t& _a, const etk::String& _b) {
m_int32 = _a; m_int32 = _a;
m_string = _b; m_string = _b;
} }
@ -247,7 +247,7 @@ class testCallbackSharedHerited : public testCallbackShared {
TEST(test_signal_shared_ptr_func, localFunctionHerited) { TEST(test_signal_shared_ptr_func, localFunctionHerited) {
ememory::SharedPtr<testCallbackSharedHerited> localClass = ememory::makeShared<testCallbackSharedHerited>(); ememory::SharedPtr<testCallbackSharedHerited> localClass = ememory::makeShared<testCallbackSharedHerited>();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
signal.connect(localClass, &testCallbackSharedHerited::callbackHerited); signal.connect(localClass, &testCallbackSharedHerited::callbackHerited);

View File

@ -3,18 +3,18 @@
* *
* @copyright 2016, Edouard DUPIN, all right reserved * @copyright 2016, Edouard DUPIN, all right reserved
* *
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#define NAME "SingleArg" #define NAME "SingleArg"
#include <gtest/gtest.h> #include <etest/etest.hpp>
#include <esignal/Signal.hpp> #include <esignal/Signal.hpp>
#include <esignal/Interface.hpp> #include <esignal/Interface.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
#include <test-debug/debug.hpp> #include <test-debug/debug.hpp>
static int32_t tmpRetInt32 = 0; static int32_t tmpRetInt32 = 0;
static std::string tmpRetString = ""; static etk::String tmpRetString = "";
static bool tmpRetVoid = false; static bool tmpRetVoid = false;
static void clear() { static void clear() {
@ -38,35 +38,35 @@ static void callbackConstInt(const int32_t& _a){
tmpRetInt32 = _a; tmpRetInt32 = _a;
}; };
static void callbackString(std::string _b){ static void callbackString(etk::String _b){
TEST_VERBOSE("event b=" << _b); TEST_VERBOSE("event b=" << _b);
tmpRetString = _b; tmpRetString = _b;
}; };
static void callbackConstString(const std::string& _b){ static void callbackConstString(const etk::String& _b){
TEST_VERBOSE("event b=" << _b); TEST_VERBOSE("event b=" << _b);
tmpRetString = _b; tmpRetString = _b;
}; };
static void callbackIntString(int32_t _a, std::string _b){ static void callbackIntString(int32_t _a, etk::String _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b); TEST_VERBOSE("event a=" << _a << " b=" << _b);
tmpRetInt32 = _a; tmpRetInt32 = _a;
tmpRetString = _b; tmpRetString = _b;
}; };
static void callbackConstIntString(const int32_t& _a, const std::string& _b){ static void callbackConstIntString(const int32_t& _a, const etk::String& _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b); TEST_VERBOSE("event a=" << _a << " b=" << _b);
tmpRetInt32 = _a; tmpRetInt32 = _a;
tmpRetString = _b; tmpRetString = _b;
}; };
static void callbackMixedIntString(int32_t _a, const std::string& _b){ static void callbackMixedIntString(int32_t _a, const etk::String& _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b); TEST_VERBOSE("event a=" << _a << " b=" << _b);
tmpRetInt32 = _a; tmpRetInt32 = _a;
tmpRetString = _b; tmpRetString = _b;
}; };
static void callbackPolyargs(const int32_t& _a, const std::string& _b, char _char, int _int) { static void callbackPolyargs(const int32_t& _a, const etk::String& _b, char _char, int _int) {
TEST_VERBOSE("event a=" << _a << " b=" << _b << " _char=" << _char << " _int=" << _int); TEST_VERBOSE("event a=" << _a << " b=" << _b << " _char=" << _char << " _int=" << _int);
tmpRetInt32 = _a + _int; tmpRetInt32 = _a + _int;
tmpRetString = _b + _char; tmpRetString = _b + _char;
@ -110,7 +110,7 @@ TEST(test_signal_static_func, localFunctionConstInt32) {
TEST(test_signal_static_func, localFunctionString) { TEST(test_signal_static_func, localFunctionString) {
clear(); clear();
esignal::Signal<std::string> signal; esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackString); esignal::Connection connection1 = signal.connect(&callbackString);
@ -122,7 +122,7 @@ TEST(test_signal_static_func, localFunctionString) {
TEST(test_signal_static_func, localFunctionConstString) { TEST(test_signal_static_func, localFunctionConstString) {
clear(); clear();
esignal::Signal<std::string> signal; esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackConstString); esignal::Connection connection1 = signal.connect(&callbackConstString);
@ -134,7 +134,7 @@ TEST(test_signal_static_func, localFunctionConstString) {
TEST(test_signal_static_func, localFunctionIntString) { TEST(test_signal_static_func, localFunctionIntString) {
clear(); clear();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackIntString); esignal::Connection connection1 = signal.connect(&callbackIntString);
@ -147,7 +147,7 @@ TEST(test_signal_static_func, localFunctionIntString) {
TEST(test_signal_static_func, localFunctionConstIntString) { TEST(test_signal_static_func, localFunctionConstIntString) {
clear(); clear();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackConstIntString); esignal::Connection connection1 = signal.connect(&callbackConstIntString);
@ -160,7 +160,7 @@ TEST(test_signal_static_func, localFunctionConstIntString) {
TEST(test_signal_static_func, localFunctionMixedIntString) { TEST(test_signal_static_func, localFunctionMixedIntString) {
clear(); clear();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackMixedIntString); esignal::Connection connection1 = signal.connect(&callbackMixedIntString);
@ -180,7 +180,7 @@ TEST(test_signal_static_func, localFunctionMixedIntString) {
} }
TEST(test_signal_static_func, localFunctionConstIntStringPolyArg) { TEST(test_signal_static_func, localFunctionConstIntStringPolyArg) {
clear(); clear();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(complete_args(&callbackPolyargs, 'c', 12365)); esignal::Connection connection1 = signal.connect(complete_args(&callbackPolyargs, 'c', 12365));
@ -193,7 +193,7 @@ TEST(test_signal_static_func, localFunctionMixedIntString) {
#else #else
/* /*
template<class Func, class... ARGS_BASE, class... ARGS_CURR> template<class Func, class... ARGS_BASE, class... ARGS_CURR>
std::function<void(const ARGS_BASE&...)> complete_args(Func _f, ARGS_BASE... _arg) { etk::Function<void(const ARGS_BASE&...)> complete_args(Func _f, ARGS_BASE... _arg) {
return [=](const ARGS_BASE&..., ARGS_CURR...){ return [=](const ARGS_BASE&..., ARGS_CURR...){
return _f( cargs..., _arg... ); return _f( cargs..., _arg... );
}; };
@ -204,7 +204,7 @@ TEST(test_signal_static_func, localFunctionMixedIntString) {
#if 0 #if 0
TEST(test_signal_static_func, localFunctionConstIntStringPolyArgWithJAJA) { TEST(test_signal_static_func, localFunctionConstIntStringPolyArgWithJAJA) {
clear(); clear();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackPolyargs, 'c', 12365); esignal::Connection connection1 = signal.connect(&callbackPolyargs, 'c', 12365);
@ -218,11 +218,11 @@ TEST(test_signal_static_func, localFunctionConstIntStringPolyArgWithJAJA) {
TEST(test_signal_static_func, localFunctionLambda) { TEST(test_signal_static_func, localFunctionLambda) {
clear(); clear();
esignal::Signal<int32_t, std::string> signal; esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0); EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true); EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect( esignal::Connection connection1 = signal.connect(
[](int32_t _a, const std::string& _b) { [](int32_t _a, const etk::String& _b) {
tmpRetInt32 = _a; tmpRetInt32 = _a;
tmpRetString = _b; tmpRetString = _b;
} }

View File

@ -1 +1 @@
0.5.0 1.0.0