From 9f7fc399c03f26ac8c70cb5b9829930f3186aec8 Mon Sep 17 00:00:00 2001 From: Armin Stebich Date: Fri, 30 Apr 2021 10:46:14 +0200 Subject: [PATCH 01/28] Update .gitignore, CMake/Qt created files/folders ignore folders and files created on Windows by CMake/Qt --- .gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index 4de9761..e1d3404 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,13 @@ bin /*.prof .idea/ bazel* + +# CMake/QtCreator folders and files created on Windows +CMakeFiles/ +*/CMakeFiles/ +CMakeCache*.* +Makefile* +moc_*.* +mocs_*.* +qrc_*.* +*.cmake From 87b59800bd7fa865273877c4cb7f48b24f88d867 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Mon, 17 May 2021 23:47:54 +0300 Subject: [PATCH 02/28] Create LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 5642517..1ab15b0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2016-2019 Sergey Yagovtsev, Victor Zarubkin +Copyright (c) 2016-2021 Sergey Yagovtsev, Victor Zarubkin Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 66e043a35386c71fc3a447abf2ad33aa7caae5a6 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sat, 5 Jun 2021 23:22:56 +0300 Subject: [PATCH 03/28] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 3cd61e5..93afd7a 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -2,4 +2,4 @@ github: yse open_collective: easy_profiler -custom: paypal.me/ysergey +custom: ['paypal.me/ysergey'] From 4684b3430f90a274621dddda644ed344ba9246aa Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sat, 5 Jun 2021 23:30:56 +0300 Subject: [PATCH 04/28] Update FUNDING.yml --- .github/FUNDING.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 93afd7a..6f071ef 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,5 +1,4 @@ # These are supported funding model platforms -github: yse open_collective: easy_profiler -custom: ['paypal.me/ysergey'] +custom: ['https://paypal.me/ysergey'] From 646c2de5f454361c9e4f3e436617703239c0308c Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sat, 5 Jun 2021 23:48:46 +0300 Subject: [PATCH 05/28] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d12220..9408be0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -dist: trusty +dist: xenial language: cpp cache: ccache matrix: From ff31cf1c91457d7723bb09e50e076b110be0bfc4 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sat, 5 Jun 2021 23:52:23 +0300 Subject: [PATCH 06/28] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9408be0..1eacf7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ matrix: - g++-5 - cmake - cmake-data + - qt5-default env: -CXX_COMPILER=g++-5 -C_COMPILER=gcc-5 @@ -30,7 +31,6 @@ script: - cd build - cmake --version - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - source /opt/qt55/bin/qt55-env.sh; qmake -v; else export PATH=/usr/local/opt/qt/bin:$PATH; @@ -41,7 +41,6 @@ after_success: - ./build_express_test.sh before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - sudo add-apt-repository --yes ppa:beineri/opt-qt551-trusty; sudo apt-get update -qq; else brew update; From 3b1794c227d1bde4f0ee4c7061705c86a29d9271 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sat, 5 Jun 2021 23:56:11 +0300 Subject: [PATCH 07/28] Update .travis.yml --- .travis.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1eacf7f..28187f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,7 @@ matrix: -C_COMPILER=gcc-5 - os: osx osx_image: xcode10 - #compiler: clang env: - #-CXX_COMPILER=clang++ - #-C_COMPILER=clang -CXX_COMPILER=g++-5 -C_COMPILER=gcc-5 script: @@ -40,20 +37,12 @@ after_success: - cd ../sample && $CXX_COMPILER -std=c++11 -O3 main_clock.cpp -o test_clock && ./test_clock - ./build_express_test.sh before_install: - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - sudo apt-get update -qq; - else + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi install: - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - sudo apt-get -y install qt55tools qt55script qt55base qt55svg; - else + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install gcc5; brew install qt; brew link --force qt; fi - - - - From 69c43265b39c2458c2af4c9551ae76276663bfcd Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 00:04:52 +0300 Subject: [PATCH 08/28] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 28187f6..fd3ea2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: -CXX_COMPILER=g++-5 -C_COMPILER=gcc-5 - os: osx - osx_image: xcode10 + osx_image: xcode11.4 env: -CXX_COMPILER=g++-5 -C_COMPILER=gcc-5 From 85d84db95d6842150827cea3d04056273ca0e5cd Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 00:18:46 +0300 Subject: [PATCH 09/28] Update .travis.yml --- .travis.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd3ea2b..2300a3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ -sudo: required dist: xenial language: cpp cache: ccache @@ -26,20 +25,13 @@ matrix: script: - mkdir build - cd build - - cmake --version - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - qmake -v; - else + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH=/usr/local/opt/qt/bin:$PATH; fi - cmake -DCMAKE_CXX_COMPILER=$CXX_COMPILER -DCMAKE_C_COMPILER=$C_COMPILER .. && make -j3 after_success: - cd ../sample && $CXX_COMPILER -std=c++11 -O3 main_clock.cpp -o test_clock && ./test_clock - ./build_express_test.sh -before_install: - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then - brew update; - fi install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install gcc5; From 652202db7122c636a09d1d5652f202170dbac09a Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 00:34:26 +0300 Subject: [PATCH 10/28] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2300a3d..a7707c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ matrix: env: -CXX_COMPILER=g++-5 -C_COMPILER=gcc-5 + -HOMEBREW_NO_AUTO_UPDATE=1 script: - mkdir build - cd build From 1a9ee8988bb604b428dd40fe6131f0295684f431 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 14:38:34 +0300 Subject: [PATCH 11/28] Delete LICENSE --- LICENSE | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 1ab15b0..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2016-2021 Sergey Yagovtsev, Victor Zarubkin - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. From 2597cca925603c8896ba0103acd79834901852cb Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 14:40:56 +0300 Subject: [PATCH 12/28] Delete LICENSE.APACHE --- LICENSE.APACHE | 177 ------------------------------------------------- 1 file changed, 177 deletions(-) delete mode 100644 LICENSE.APACHE diff --git a/LICENSE.APACHE b/LICENSE.APACHE deleted file mode 100644 index f433b1a..0000000 --- a/LICENSE.APACHE +++ /dev/null @@ -1,177 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS From 11325f43bf03bef8ec366e7482dd51e691f85ce5 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 14:41:08 +0300 Subject: [PATCH 13/28] Delete LICENSE.MIT --- LICENSE.MIT | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 LICENSE.MIT diff --git a/LICENSE.MIT b/LICENSE.MIT deleted file mode 100644 index 448274c..0000000 --- a/LICENSE.MIT +++ /dev/null @@ -1,18 +0,0 @@ -Copyright (c) 2016-2019 Sergey Yagovtsev, Victor Zarubkin - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file From dd1692e50c4417c06c0c88c27ba5312432702af2 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 14:42:12 +0300 Subject: [PATCH 14/28] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1ab15b0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016-2021 Sergey Yagovtsev, Victor Zarubkin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 3804a934253c4498b6dc2ef246e689fb903b0f6c Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 14:43:55 +0300 Subject: [PATCH 15/28] Revert "Delete LICENSE.APACHE" This reverts commit 2597cca925603c8896ba0103acd79834901852cb. --- LICENSE.APACHE | 177 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 LICENSE.APACHE diff --git a/LICENSE.APACHE b/LICENSE.APACHE new file mode 100644 index 0000000..f433b1a --- /dev/null +++ b/LICENSE.APACHE @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS From 6dd888a7007f5057c300f011756a3768021ea931 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 14:44:08 +0300 Subject: [PATCH 16/28] Revert "Delete LICENSE.MIT" This reverts commit 11325f43bf03bef8ec366e7482dd51e691f85ce5. --- LICENSE.MIT | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 LICENSE.MIT diff --git a/LICENSE.MIT b/LICENSE.MIT new file mode 100644 index 0000000..448274c --- /dev/null +++ b/LICENSE.MIT @@ -0,0 +1,18 @@ +Copyright (c) 2016-2019 Sergey Yagovtsev, Victor Zarubkin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file From c4d548cc919ac3738e84f016d8520ef4bcb8f98b Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 14:48:45 +0300 Subject: [PATCH 17/28] Licenses --- LICENSE | 21 --------------------- README.md | 4 ++-- LICENSE.APACHE => apache.lic | 0 LICENSE.MIT => mit.lic | 0 4 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 LICENSE rename LICENSE.APACHE => apache.lic (100%) rename LICENSE.MIT => mit.lic (100%) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 1ab15b0..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2016-2021 Sergey Yagovtsev, Victor Zarubkin - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md index 78bb9ed..0805075 100644 --- a/README.md +++ b/README.md @@ -321,7 +321,7 @@ struct EasyFileHeader { # License Licensed under either of -- MIT license ([LICENSE.MIT](LICENSE.MIT) or http://opensource.org/licenses/MIT) -- Apache License, Version 2.0, ([LICENSE.APACHE](LICENSE.APACHE) or http://www.apache.org/licenses/LICENSE-2.0) +- MIT license ([mit.lic](LICENSE.MIT) or http://opensource.org/licenses/MIT) +- Apache License, Version 2.0, ([apache.lic](LICENSE.APACHE) or http://www.apache.org/licenses/LICENSE-2.0) at your option. diff --git a/LICENSE.APACHE b/apache.lic similarity index 100% rename from LICENSE.APACHE rename to apache.lic diff --git a/LICENSE.MIT b/mit.lic similarity index 100% rename from LICENSE.MIT rename to mit.lic From f6b3bb5ccbc8d02dbc82e6aea1415a2493265cdc Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 14:49:23 +0300 Subject: [PATCH 18/28] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1ab15b0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016-2021 Sergey Yagovtsev, Victor Zarubkin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 72b7e0f33b886889d6115c471b0c79887cab08df Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 14:52:13 +0300 Subject: [PATCH 19/28] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0805075..688eaee 100644 --- a/README.md +++ b/README.md @@ -321,7 +321,7 @@ struct EasyFileHeader { # License Licensed under either of -- MIT license ([mit.lic](LICENSE.MIT) or http://opensource.org/licenses/MIT) -- Apache License, Version 2.0, ([apache.lic](LICENSE.APACHE) or http://www.apache.org/licenses/LICENSE-2.0) +- MIT license ([mit.lic](mit.lic) or http://opensource.org/licenses/MIT) +- Apache License, Version 2.0 ([apache.lic](apache.lic) or http://www.apache.org/licenses/LICENSE-2.0) at your option. From 0cbb0dc2c63e6d361cd24fe3c43d16b36ebf11b8 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 15:15:38 +0300 Subject: [PATCH 20/28] Remove funding --- .github/FUNDING.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 6f071ef..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,4 +0,0 @@ -# These are supported funding model platforms - -open_collective: easy_profiler -custom: ['https://paypal.me/ysergey'] From 7f9bca4dccfdf2deb54afdc3e92d37f2c9e1b0a0 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Sun, 6 Jun 2021 15:19:24 +0300 Subject: [PATCH 21/28] Add FUNDING --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..1e22785 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +github: [yse, cas4ey] +open_collective: easy_profiler +custom: ["https://paypal.me/ysergey"] From 98bfd80dfcba851589b05d07a350d98921cec51c Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Wed, 9 Jun 2021 15:58:26 +0300 Subject: [PATCH 22/28] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 688eaee..6a49320 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # easy_profiler [![2.1.0](https://img.shields.io/badge/stable-2.1.0-009688.svg)](https://github.com/yse/easy_profiler/releases/tag/v2.1.0) [![2.x.x](https://img.shields.io/badge/latest-2.x.x-f57f17.svg)](https://github.com/yse/easy_profiler) -[![Build Status](https://travis-ci.org/yse/easy_profiler.svg?branch=develop)](https://travis-ci.org/yse/easy_profiler) +[![Build Status](https://travis-ci.com/yse/easy_profiler.svg?branch=develop)](https://travis-ci.org/yse/easy_profiler) [![Build Status](https://ci.appveyor.com/api/projects/status/github/yse/easy_profiler?branch=develop&svg=true)](https://ci.appveyor.com/project/yse/easy-profiler/branch/develop) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) From 009621197e6f3e65b2b4765a1f69a00fea52b106 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Wed, 9 Jun 2021 16:11:31 +0300 Subject: [PATCH 23/28] Update .travis.yml --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7707c7..46bdd7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,10 @@ dist: xenial language: cpp cache: ccache -matrix: +os: + - linux + - osx +jobs: include: - compiler: gcc os: linux @@ -30,9 +33,6 @@ script: export PATH=/usr/local/opt/qt/bin:$PATH; fi - cmake -DCMAKE_CXX_COMPILER=$CXX_COMPILER -DCMAKE_C_COMPILER=$C_COMPILER .. && make -j3 -after_success: - - cd ../sample && $CXX_COMPILER -std=c++11 -O3 main_clock.cpp -o test_clock && ./test_clock - - ./build_express_test.sh install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install gcc5; From 5d85ba09b09035f03c8c59219d83870e4b813d9a Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Wed, 9 Jun 2021 16:12:35 +0300 Subject: [PATCH 24/28] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6a49320..3fde220 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # easy_profiler [![2.1.0](https://img.shields.io/badge/stable-2.1.0-009688.svg)](https://github.com/yse/easy_profiler/releases/tag/v2.1.0) [![2.x.x](https://img.shields.io/badge/latest-2.x.x-f57f17.svg)](https://github.com/yse/easy_profiler) -[![Build Status](https://travis-ci.com/yse/easy_profiler.svg?branch=develop)](https://travis-ci.org/yse/easy_profiler) +[![Build Status](https://travis-ci.com/yse/easy_profiler.svg?branch=develop)](https://travis-ci.com/yse/easy_profiler) [![Build Status](https://ci.appveyor.com/api/projects/status/github/yse/easy_profiler?branch=develop&svg=true)](https://ci.appveyor.com/project/yse/easy-profiler/branch/develop) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) From e5a063af817bd09b7b0c91291e7e344c346be682 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Wed, 9 Jun 2021 16:15:40 +0300 Subject: [PATCH 25/28] Update .travis.yml --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 46bdd7c..c5966c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ dist: xenial -language: cpp cache: ccache -os: - - linux - - osx jobs: include: - compiler: gcc From 3104dd4ae7b9930a7c2ba9ed5fdb02f41b1668e4 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Wed, 9 Jun 2021 16:16:22 +0300 Subject: [PATCH 26/28] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c5966c0..0b26f70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ dist: xenial cache: ccache +language: cpp jobs: include: - compiler: gcc From af758e204dd4096b5f0180f0b6c98c27011a48d6 Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Mon, 13 Nov 2023 23:15:51 +0300 Subject: [PATCH 27/28] #186 Prevent infinite loop --- profiler_gui/tree_widget_item.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profiler_gui/tree_widget_item.cpp b/profiler_gui/tree_widget_item.cpp index d78b980..27f539b 100644 --- a/profiler_gui/tree_widget_item.cpp +++ b/profiler_gui/tree_widget_item.cpp @@ -374,9 +374,9 @@ const profiler::BlocksTree& TreeWidgetItem::block() const profiler::thread_id_t TreeWidgetItem::threadId() const { const QTreeWidgetItem* parentItem = this; - while (parentItem->parent() != nullptr) + while (parentItem != nullptr && parentItem->parent() != nullptr) { - parentItem = parent(); + parentItem = parentItem->parent(); } return static_cast(parentItem->data(COL_NAME, Qt::UserRole).toULongLong()); } From 04a472121e80fb8f98e5785b0d43cdc2d0eda7ea Mon Sep 17 00:00:00 2001 From: Sergey Yagovtsev Date: Mon, 13 Nov 2023 23:49:13 +0300 Subject: [PATCH 28/28] #210 Safety range for GraphicsBlockItem intersection --- profiler_gui/graphics_block_item.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/profiler_gui/graphics_block_item.cpp b/profiler_gui/graphics_block_item.cpp index f8d322c..06f1e1f 100644 --- a/profiler_gui/graphics_block_item.cpp +++ b/profiler_gui/graphics_block_item.cpp @@ -1271,9 +1271,26 @@ const ::profiler_gui::EasyBlock* GraphicsBlockItem::intersect(const QPointF& _po while (i <= levelIndex) { const auto& level = m_levels[i]; + size_t levelSize = level.size(); + + auto firstItemIterator = level.begin(); + auto lastItemIterator = level.begin(); + + // Ensure that firstItem and lastItem are within the permissible range + if (firstItem < levelSize) { + std::advance(firstItemIterator, firstItem); + } else { + firstItemIterator = level.end(); + } + + if (lastItem <= levelSize) { + std::advance(lastItemIterator, lastItem); + } else { + lastItemIterator = level.end(); + } // Search for first visible item - auto first = ::std::lower_bound(level.begin() + firstItem, level.begin() + lastItem, _pos.x(), [](const ::profiler_gui::EasyBlockItem& _item, qreal _value) + auto first = ::std::lower_bound(firstItemIterator, lastItemIterator, _pos.x(), [](const ::profiler_gui::EasyBlockItem& _item, qreal _value) { return _item.left() < _value; });