diff --git a/.gitignore b/.gitignore index 59a4f91..eefeeb2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ CMakeFiles/ CMakeCache.txt Makefile *.bin -qngmeter \ No newline at end of file +qngmeter +*.json \ No newline at end of file diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 8000a6f..0000000 --- a/LICENSE +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random - Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/QNGmeter.cpp b/QNGmeter.cpp index 7feae1e..c937d11 100755 --- a/QNGmeter.cpp +++ b/QNGmeter.cpp @@ -1,8 +1,16 @@ +#define _DEFAULT_SOURCE + #ifdef _WIN32 #include #include +#else +#include +#include +#include +#include #endif +#include #include #include #include @@ -11,12 +19,15 @@ #include #include -#include #include #include #include #include +#include +#include +#include + #include "BiasAndAC.h" #include "Monkey.h" #include "Serial.h" @@ -41,9 +52,46 @@ using namespace std; } #endif -#define _BSD_SOURCE -#include - +template +class ThreadSafeQueue { +private: + mutable std::mutex mtx; + std::deque dataQueue; + std::condition_variable dataCond; + +public: + ThreadSafeQueue() {} + + void push(T newData) { + std::lock_guard lk(mtx); + dataQueue.push_back(std::move(newData)); + dataCond.notify_one(); + } + + bool try_pop(T& value) { + std::lock_guard lk(mtx); + if (dataQueue.empty()) { + return false; + } + value = std::move(dataQueue.front()); + dataQueue.pop_front(); + return true; + } + + std::unique_lock wait_and_pop(T& value) { + std::unique_lock lk(mtx); + dataCond.wait(lk, [this] { return !dataQueue.empty(); }); + value = std::move(dataQueue.front()); + dataQueue.pop_front(); + return lk; + } + + bool empty() const { + std::lock_guard lk(mtx); + return dataQueue.empty(); + } +}; + int main() { // try this to resize terminal @@ -90,7 +138,7 @@ int main() time(&timePrev); timePrev -= 8; - queue > > dataQueue; + //queue > > dataQueue; double bitsThroughputCount = 0; double prevBitsThroughputCount = 0; @@ -119,278 +167,409 @@ int main() double meterScore = 0; bool meterFreeze = false; - omp_set_nested(true); + const char* fifoPath = "/tmp/QNGmeter"; +#ifdef __linux + mkfifo(fifoPath, 0666); // Create FIFO if it doesn't exist + int fifoFd = open(fifoPath, O_RDONLY | O_NONBLOCK); + if (fifoFd == -1) { + std::cerr << "Failed to open named pipe for reading." << std::endl; + return 1; + } +#endif - #pragma omp parallel sections num_threads(2) + fd_set readfds; + int maxfd = max(STDIN_FILENO, fifoFd) + 1; + + ThreadSafeQueue dataQueue; // Use a thread-safe queue for shared data + + omp_set_nested(true); // Ensure nested parallelism is enabled + + #pragma omp parallel sections { - #pragma omp section { - // This section reads from stdin as binary data and enqueues it for testing - const size_t blockSize = 2048; // Number of uint32_t values in a block - const size_t bytesPerValue = sizeof(uint32_t); - const size_t bufferSize = blockSize * bytesPerValue; // Total bytes per block - char buffer[bufferSize]; // Temporary buffer to store bytes - while (!cin.eof() && !doExit) { - cin.read(buffer, bufferSize); - size_t bytesRead = cin.gcount(); + fd_set readfds; + int fifoFd = open ("/tmp/myfifo", O_RDONLY | O_NONBLOCK); + if (fifoFd == -1) + { + perror ("Failed to open FIFO"); + exit (EXIT_FAILURE); + } - // Convert read bytes to uint32_t and store in a vector - shared_ptr> newBuffer(new vector()); - for (size_t i = 0; i < bytesRead; i += bytesPerValue) { - if (i + bytesPerValue <= bytesRead) { - // Ensure we have a full 4 bytes to read - uint32_t value = 0; - memcpy(&value, buffer + i, bytesPerValue); - newBuffer->push_back(value); + int maxfd = max (STDIN_FILENO, fifoFd) + 1; + ThreadSafeQueue < std::string > dataQueue; + + while (!doExit) + { + FD_ZERO (&readfds); + FD_SET (STDIN_FILENO, &readfds); + FD_SET (fifoFd, &readfds); + + if (select (maxfd, &readfds, NULL, NULL, NULL) == -1) + { + perror ("select"); + exit (EXIT_FAILURE); + } + + char buffer[4096]; + ssize_t bytesRead; + + if (FD_ISSET (STDIN_FILENO, &readfds)) + { + bytesRead = read (STDIN_FILENO, buffer, sizeof (buffer)); + if (bytesRead > 0) + { + dataQueue.push (std::string (buffer, bytesRead)); } } - if (!newBuffer->empty()) { - #pragma omp critical - dataQueue.push(newBuffer); + if (FD_ISSET (fifoFd, &readfds)) + { + bytesRead = read (fifoFd, buffer, sizeof (buffer)); + if (bytesRead > 0) + { + dataQueue.push (std::string (buffer, bytesRead)); + } } } - doExit = true; // Exit if stdin closes or reaches EOF - } + close (fifoFd); + } #pragma omp section { - // This section processes the enqueued data - while (!doExit || !dataQueue.empty()) { - shared_ptr> testBuffer = nullptr; - #pragma omp critical + std::string buffer; // This will hold the raw binary string data from the queue + while (!doExit) + { + if (dataQueue.try_pop (buffer)) { - if (!dataQueue.empty()) { - testBuffer = dataQueue.front(); - dataQueue.pop(); - } - } - - if (testBuffer != nullptr) { - // Parallel processing of the testBuffer - #pragma omp parallel sections num_threads(4) + // Assuming each uint32_t is stored in 4 bytes within the string + // Convert the string buffer into a vector for processing + std::vector < uint32_t > values; + const size_t numValues = buffer.size () / sizeof (uint32_t); + for (size_t i = 0; i < numValues; ++i) { - #pragma omp section - { for (uint32_t value : *testBuffer) biasAndAc.InsertWord32(value); } - #pragma omp section - { for (uint32_t value : *testBuffer) oqso.InsertWord32(value); } - #pragma omp section - { for (uint32_t value : *testBuffer) serial.InsertWord32(value); } - #pragma omp section - { for (uint32_t value : *testBuffer) entropy.InsertWord32(value); } + uint32_t value; + memcpy (&value, buffer.data () + i * sizeof (uint32_t), + sizeof (uint32_t)); + values.push_back (value); } - + + // Now, values contains the uint32_t data extracted from buffer + // Process the values as needed + #pragma omp parallel sections num_threads(4) + { + #pragma omp section + { + for (uint32_t value:values) + biasAndAc.InsertWord32 (value); + } + #pragma omp section + { + for (uint32_t value:values) + oqso.InsertWord32 (value); + } + #pragma omp section + { + for (uint32_t value:values) + serial.InsertWord32 (value); + } + #pragma omp section + { + for (uint32_t value:values) + entropy.InsertWord32 (value); + } + } + // Display results - time(&timeNow); - if (difftime(timeNow, timePrev) >= 10) + time (&timeNow); + if (difftime (timeNow, timePrev) >= 10) { // calc rates - #ifdef _WIN32 - QueryPerformanceCounter(&nowCount); - double newTimeInterval = ((double)nowCount.QuadPart - prevCount.QuadPart) / countFreq.QuadPart; - prevCount = nowCount; - #elif __linux - gettimeofday(&stop, NULL); - newTimeInterval = (stop.tv_sec - start.tv_sec); // sec - newTimeInterval += (stop.tv_usec - start.tv_usec) /1000000.0; // us to sec - start = stop; - #elif MACOSX - #endif + #ifdef _WIN32 + QueryPerformanceCounter (&nowCount); + double newTimeInterval = + ((double) nowCount.QuadPart - + prevCount.QuadPart) / countFreq.QuadPart; + prevCount = nowCount; + #elif __linux + gettimeofday (&stop, NULL); + newTimeInterval = (stop.tv_sec - start.tv_sec); // sec + newTimeInterval += (stop.tv_usec - start.tv_usec) / 1000000.0; // us to sec + start = stop; + #elif MACOSX + #endif double newBitInterval; double newRate; - #pragma omp critical + #pragma omp critical { - newBitInterval = (bitsThroughputCount - prevBitsThroughputCount); - prevBitsThroughputCount = bitsThroughputCount; + newBitInterval = + (bitsThroughputCount - prevBitsThroughputCount); + prevBitsThroughputCount = bitsThroughputCount; } newRate = newBitInterval / newTimeInterval; if (throughput == 0) - throughput = newRate; + throughput = newRate; else - throughput = (2*throughput + newRate) / 3; + throughput = (2 * throughput + newRate) / 3; - double newBitsTestedRatio = (bitsTestedCount-prevBitsTestedCount) / newBitInterval; + double newBitsTestedRatio = + (bitsTestedCount - prevBitsTestedCount) / newBitInterval; prevBitsTestedCount = bitsTestedCount; - bitsTestedRatio = (2*bitsTestedRatio + newBitsTestedRatio) / 3; + bitsTestedRatio = + (2 * bitsTestedRatio + newBitsTestedRatio) / 3; if (bitsTestedRatio > 1) - bitsTestedRatio = 1; + bitsTestedRatio = 1; // meta test and meter - metaPs.clear(); - meterZs.clear(); + metaPs.clear (); + meterZs.clear (); if (bitsTestedCount >= 65536) { // Autocorrelation KS test - for (int i=0; i<32; i++) + for (int i = 0; i < 32; i++) { - metaPs.push_back(biasAndAc.AC.P_Chi2[i]); - meterZs.push_back(biasAndAc.AC.cumulativeACZScore[i]); + metaPs.push_back (biasAndAc.AC.P_Chi2[i]); + meterZs.push_back (biasAndAc.AC. + cumulativeACZScore[i]); } double AcKSP; double AcKSN; - ks.KSUP(&AcKSP, &AcKSN, &metaPs[0], metaPs.size()); + ks.KSUP (&AcKSP, &AcKSN, &metaPs[0], metaPs.size ()); // Combined KS test - metaPs.push_back(AcKSP); + metaPs.push_back (AcKSP); - metaPs.push_back(biasAndAc.Bias.P_Chi2); - meterZs.push_back(biasAndAc.Bias.cumulativeBiasZScore); + metaPs.push_back (biasAndAc.Bias.P_Chi2); + meterZs.push_back (biasAndAc.Bias.cumulativeBiasZScore); } if (bitsTestedCount >= 4194304) { - metaPs.push_back(serial.P_Chi2); - serialP = gamma.Gamma(128., serial.cumulativeSerialChi2); - serialZ = ks.PtoZ(serialP); - meterZs.push_back(serialZ); + metaPs.push_back (serial.P_Chi2); + serialP = gamma.Gamma (128., serial.cumulativeSerialChi2); + serialZ = ks.PtoZ (serialP); + meterZs.push_back (serialZ); - metaPs.push_back(entropy.P_Chi2); - meterZs.push_back(entropy.cumulativeZScore); + metaPs.push_back (entropy.P_Chi2); + meterZs.push_back (entropy.cumulativeZScore); } if (bitsTestedCount >= 10485775) { - metaPs.push_back(oqso.P_Chi2); - meterZs.push_back(oqso.cumulativeZScore); + metaPs.push_back (oqso.P_Chi2); + meterZs.push_back (oqso.cumulativeZScore); } if (bitsTestedCount >= 65536) { // This KS is combined AC KSP plus with other tests - ks.KSUP(&KSP, &KSN, &metaPs[32], metaPs.size()-32); + ks.KSUP (&KSP, &KSN, &metaPs[32], metaPs.size () - 32); meterFreeze = false; - for (int i=0; i4.264897 || (metaPs[i]<0.00001 || metaPs[i]>0.99999)) - meterFlags[i] = -1; + if (fabs (meterZs[i]) > 4.264897 + || (metaPs[i] < 0.00001 || metaPs[i] > 0.99999)) + meterFlags[i] = -1; // unfreeze condition if (meterFlags[i] == -1) { - if (fabs(meterZs[i])<2.326348 && (metaPs[i]>0.01 && metaPs[i]<0.99)) - meterFlags[i] = 0; + if (fabs (meterZs[i]) < 2.326348 + && (metaPs[i] > 0.01 && metaPs[i] < 0.99)) + meterFlags[i] = 0; } if (meterFlags[i] == -1) - meterFreeze = true; + meterFreeze = true; } // meter calc if (meterFreeze == false) - meterScore = log(bitsTestedCount)/log(2.); + meterScore = log (bitsTestedCount) / log (2.); } cout << endl; - cout << " QNGmeter Console 1.0 Test Type z-score p[z<=x] p[chi2<=x] " << endl; - cout << " +---------------------------+------------------------------------------------+" << endl; - cout << " | | 1/0 Balance " << setiosflags(ios::fixed) << setprecision(3) << showpos << biasAndAc.Bias.cumulativeBiasZScore << " " << setprecision(4) << noshowpos << CStat::ZtoP(biasAndAc.Bias.cumulativeBiasZScore) << " " << biasAndAc.Bias.P_Chi2 << " |" << endl; - cout << " | | Serial Test " << setiosflags(ios::fixed) << setprecision(3) << showpos << serialZ << " " << setprecision(4) << noshowpos << serialP << " " << serial.P_Chi2 << " |" << endl; - cout << " | | OQSO Test " << setiosflags(ios::fixed) << setprecision(3) << showpos << oqso.cumulativeZScore << " " << setprecision(4) << noshowpos << CStat::ZtoP(oqso.cumulativeZScore) << " " << oqso.P_Chi2 << " |" << endl; - cout << " | | Entropy Test " << setiosflags(ios::fixed) << setprecision(3) << showpos << entropy.cumulativeZScore << " " << setprecision(4) << noshowpos << CStat::ZtoP(entropy.cumulativeZScore) << " " << serial.P_Chi2 << " |" << endl; - cout << " | | H: " << setiosflags(ios::fixed) << setprecision(9) << entropy.E << " |" << endl; - - cout << " | | |" << endl; + cout << + " QNGmeter Console 1.0 Test Type z-score p[z<=x] p[chi2<=x] " + << endl; + cout << + " +---------------------------+------------------------------------------------+" + << endl; + cout << " | | 1/0 Balance " + << setiosflags (ios:: + fixed) << setprecision (3) << showpos << + biasAndAc.Bias. + cumulativeBiasZScore << " " << setprecision (4) << + noshowpos << CStat::ZtoP (biasAndAc.Bias. + cumulativeBiasZScore) << " " << + biasAndAc.Bias.P_Chi2 << " |" << endl; + cout << " | | Serial Test " + << setiosflags (ios:: + fixed) << setprecision (3) << showpos << + serialZ << " " << setprecision (4) << noshowpos << + serialP << " " << serial.P_Chi2 << " |" << endl; + cout << " | | OQSO Test " + << setiosflags (ios:: + fixed) << setprecision (3) << showpos << + oqso. + cumulativeZScore << " " << setprecision (4) << noshowpos + << CStat::ZtoP (oqso.cumulativeZScore) << " " << oqso. + P_Chi2 << " |" << endl; + cout << " | | Entropy Test " + << setiosflags (ios:: + fixed) << setprecision (3) << showpos << + entropy. + cumulativeZScore << " " << setprecision (4) << noshowpos + << CStat::ZtoP (entropy. + cumulativeZScore) << " " << serial. + P_Chi2 << " |" << endl; + cout << " | | H: " << + setiosflags (ios::fixed) << setprecision (9) << entropy. + E << " |" << endl; - for (int i=1; i<=32; i++) - { - switch(i) - { - case 2: - cout << " | Start Time |"; - break; - case 3: - cout << " | " << sStartTime << " |"; - break; - case 5: - cout << " | Total Bits Tested |"; - break; - case 6: - cout << " | " << scientific << setw(9) << setprecision(2) << bitsTestedCount << fixed << " |"; - break; - case 8: - cout << " | Throughput |"; - break; - case 9: - cout << " | " << setiosflags(ios::fixed) << setw(4) << setprecision(1) << (double)(throughput/1000000.0) << " Mbps |"; - break; - case 11: - cout << " | Bits Tested Percent |"; - break; - case 12: - cout << " | " << setiosflags(ios::fixed) << setw(5) << setprecision(1) << (100*bitsTestedRatio) << "% |"; - break; - case 18: - cout << " | Meta KS+ Test |"; - break; - case 19: - cout << " | " << setiosflags(ios::fixed) << setw(5) << setprecision(3) << KSP << " |"; - break; - case 22: - cout << " | Meta KS- Test |"; - break; - case 23: - cout << " | " << setiosflags(ios::fixed) << setw(5) << setprecision(3) << KSN << " |"; - break; - case 29: - cout << " | QNGmeter Score |"; - break; - case 30: - cout << " | " << setiosflags(ios::fixed) << setw(4) << setprecision(1) << abs(meterScore) << ((meterScore<0)? "-" : (meterFreeze==false)? "+" : " ") << " |"; - break; - default: - cout << " | |"; - } - cout << " " << setw(2) << i << "st AutoCorr " << setiosflags(ios::fixed) << setprecision(3) << showpos << biasAndAc.AC.cumulativeACZScore[i-1] << " " << setprecision(4) << noshowpos << CStat::ZtoP(biasAndAc.AC.cumulativeACZScore[i-1]) << " " << biasAndAc.AC.P_Chi2[i-1] << " |" << endl; - } - cout << " +---------------------------+------------------------------------------------+" << endl; + cout << + " | | |" + << endl; - #ifdef _WIN32 - // put cursor in top corner - COORD coord; - coord.X = 0; - coord.Y = 0; - SetConsoleCursorPosition(GetStdHandle(STD_OUTPUT_HANDLE), coord); - #elif __linux - // clear screen - // printf("\E[H"); - #elif MACOSX - #endif + for (int i = 1; i <= 32; i++) + { + switch (i) + { + case 2: + cout << " | Start Time |"; + break; + case 3: + cout << " | " << sStartTime << " |"; + break; + case 5: + cout << " | Total Bits Tested |"; + break; + case 6: + cout << " | " << scientific << setw (9) << + setprecision (2) << bitsTestedCount << fixed << + " |"; + break; + case 8: + cout << " | Throughput |"; + break; + case 9: + cout << " | " << setiosflags (ios:: + fixed) << setw (4) + << setprecision (1) << (double) (throughput / + 1000000.0) << + " Mbps |"; + break; + case 11: + cout << " | Bits Tested Percent |"; + break; + case 12: + cout << " | " << setiosflags (ios:: + fixed) << setw (5) + << setprecision (1) << (100 * + bitsTestedRatio) << + "% |"; + break; + case 18: + cout << " | Meta KS+ Test |"; + break; + case 19: + cout << " | " << setiosflags (ios:: + fixed) << setw (5) + << setprecision (3) << KSP << " |"; + break; + case 22: + cout << " | Meta KS- Test |"; + break; + case 23: + cout << " | " << setiosflags (ios:: + fixed) << setw (5) + << setprecision (3) << KSN << " |"; + break; + case 29: + cout << " | QNGmeter Score |"; + break; + case 30: + cout << " | " << setiosflags (ios:: + fixed) << setw (4) + << setprecision (1) << abs (meterScore) << + ((meterScore < 0) ? "-" : (meterFreeze == + false) ? "+" : " ") << + " |"; + break; + default: + cout << " | |"; + } + cout << " " << setw (2) << i << "st AutoCorr " << + setiosflags (ios:: + fixed) << setprecision (3) << showpos << + biasAndAc.AC.cumulativeACZScore[i - + 1] << " " << + setprecision (4) << noshowpos << CStat::ZtoP (biasAndAc. + AC. + cumulativeACZScore + [i - + 1]) << + " " << biasAndAc.AC.P_Chi2[i - 1] << " |" << endl; + } + cout << + " +---------------------------+------------------------------------------------+" + << endl; + + #ifdef _WIN32 + // put cursor in top corner + COORD coord; + coord.X = 0; + coord.Y = 0; + SetConsoleCursorPosition (GetStdHandle (STD_OUTPUT_HANDLE), + coord); + #elif __linux + // clear screen + // printf("\E[H"); + #elif MACOSX + #endif timePrev = timeNow; - cout.flush(); + cout.flush (); + buffer.clear (); } - + // End on an 'x' keypress - #ifdef _WIN32 - if (kbhit()) + #ifdef _WIN32 + if (kbhit ()) + { + char c = getch_ (); + + if (tolower (c) == 'x') { - char c = getch_(); - - if ( tolower(c) == 'x' ) - { - doExit = true; - break; - } + doExit = true; + break; } - #elif __linux - // CRTL-C - #elif MACOSX - #endif + } + #elif __linux + // CRTL-C + #elif MACOSX + #endif } else { // give this thread a break from tight loop - waiting for data - usleep(1000); + usleep (1000); } } } } + + +#ifdef __linux + close(fifoFd); // Close the FIFO file descriptor when done +#endif + + return 0; } diff --git a/readme.md b/readme.md deleted file mode 100644 index b00e43f..0000000 --- a/readme.md +++ /dev/null @@ -1,65 +0,0 @@ -# QNGFreeMeter - -A fork of [Comscire's QNGmeter Console](https://comscire.com/downloads/qngmeterdoc/) that does not require [libqwqng](https://comscire.com/downloads/) drivers or Comscire hardware but analyzes binary data passed to it via stdin pipe. - -## Build - -requires CMake and C++ compiler - -```sh -$ cmake . -$ make -``` - -## Use - -``` -$ dd if=/dev/urandom of=random_data.bin bs=4096 count=4096 -$ cat random_data.bin | ./qngmeter -``` - -## Output - -```sh - QNGmeter Console 1.0 Test Type z-score p[z<=x] p[chi2<=x] - +---------------------------+------------------------------------------------+ - | | 1/0 Balance -0.988 0.1615 0.8592 | - | | Serial Test +0.000 0.5000 0.8463 | - | | OQSO Test -0.395 0.3465 0.5839 | - | | Entropy Test +1.011 0.8439 0.8463 | - | | H: 1.000060340 | - | | | - | | 1st AutoCorr +2.147 0.9841 0.0327 | - | Start Time | 2st AutoCorr +0.561 0.7127 0.8802 | - | Mar 2 20:46:02 | 3st AutoCorr +0.332 0.6302 0.7652 | - | | 4st AutoCorr +1.148 0.8746 0.7992 | - | Total Bits Tested | 5st AutoCorr +0.539 0.7051 0.6883 | - | 0.00e+00 | 6st AutoCorr -1.338 0.0904 0.0292 | - | | 7st AutoCorr -0.595 0.2760 0.4126 | - | Throughput | 8st AutoCorr -0.710 0.2388 0.2081 | - | 0.0 Mbps | 9st AutoCorr +0.893 0.8140 0.0309 | - | | 10st AutoCorr -0.364 0.3578 0.7971 | - | Bits Tested Percent | 11st AutoCorr -0.948 0.1715 0.3216 | - | -nan% | 12st AutoCorr -0.881 0.1892 0.3113 | - | | 13st AutoCorr +0.534 0.7035 0.3231 | - | | 14st AutoCorr -0.385 0.3500 0.9147 | - | | 15st AutoCorr +0.165 0.5655 0.9145 | - | | 16st AutoCorr -0.028 0.4890 0.4693 | - | | 17st AutoCorr +1.208 0.8865 0.1560 | - | Meta KS+ Test | 18st AutoCorr +1.373 0.9151 0.8381 | - | 0.000 | 19st AutoCorr -0.154 0.4390 0.9732 | - | | 20st AutoCorr -0.233 0.4079 0.1341 | - | | 21st AutoCorr -1.723 0.0424 0.0645 | - | Meta KS- Test | 22st AutoCorr -0.897 0.1849 0.5430 | - | 0.000 | 23st AutoCorr +0.806 0.7900 0.3512 | - | | 24st AutoCorr -1.346 0.0891 0.7598 | - | | 25st AutoCorr +0.142 0.5563 0.9886 | - | | 26st AutoCorr -0.320 0.3745 0.2615 | - | | 27st AutoCorr -0.157 0.4378 0.8338 | - | | 28st AutoCorr +0.366 0.6429 0.4186 | - | QNGmeter Score | 29st AutoCorr +1.361 0.9132 0.8088 | - | 0.0+ | 30st AutoCorr -0.278 0.3905 0.4151 | - | | 31st AutoCorr -0.092 0.4634 0.2645 | - | | 32st AutoCorr +0.574 0.7170 0.7009 | - +---------------------------+------------------------------------------------+ -``` \ No newline at end of file