diff options
| -rw-r--r-- | COPYING | 280 | ||||
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | cbm.cpp | 133 | ||||
| -rw-r--r-- | config.h | 55 | ||||
| -rw-r--r-- | fsbm.cpp | 133 | ||||
| -rw-r--r-- | statistics.cpp | 160 | ||||
| -rw-r--r-- | statistics.hpp | 52 |
8 files changed, 823 insertions, 0 deletions
@@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, 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. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, 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 or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +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 give any other recipients of the Program a copy of this License +along with the Program. + +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 Program or any portion +of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +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 Program, 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 Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) 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; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, 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 executable. However, as a +special exception, the source code 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. + +If distribution of executable or 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 counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program 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. + + 5. 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 Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program 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 to +this License. + + 7. 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 Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program 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 Program. + +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. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program 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. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 Program +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 Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, 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 + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8dd5347 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +CPPC=g++ +CPPFLAGS=-O2 -Wall -Wextra -mtune=native +all: fsbm + +fsbm: fsbm.cpp + $(CPPC) fsbm.cpp statistics.cpp -o fsbm $(CPPFLAGS) + +clean: + @rm fsbm
\ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..934e916 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +well cbm, the console-bandwidth-monitor was a bit bloated. I don't want ncurses, so what we have here is a stripped down version @@ -0,0 +1,133 @@ +#include "config.h" +#include "statistics.hpp" +#include <algorithm> +#include <cstdlib> +#include <cstring> +#include <iomanip> +#include <iostream> +#include <sstream> + +#include <curses.h> +#include <getopt.h> +#include <signal.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#include <net/if.h> +#include <unistd.h> + +#define PACKAGE "yo" +#define PACKAGE_STRING "yo mamma" + +// Externs +extern int optind, opterr, optopt; + +volatile bool quit = false; + +void endHandler(int signum) { + quit = true; +} + +void formatBandwidth(double bytesPerSecond, bool showBits) { + const char* prefixes[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y" }; + + // Calculate the value + double value; + const char* unit; + if (showBits){ + value = bytesPerSecond * 8; + unit = "b/s"; + } + else { + value = bytesPerSecond; + unit = "B/s"; + } + + // Choose the prefix + unsigned prefix = 0; + while (prefix < (sizeof(prefixes) / sizeof(const char*)) && value > 1000.) { + value /= 1000.; + ++prefix; + } + + // Format the string + std::cout << std::setprecision(2) << value << " " << prefixes[prefix] << unit; + +} + +int main(int argc, char **argv) { + int retval = EXIT_SUCCESS; + + // parse the command line + int c; + + bool useBits = false; + int interval = 10 * 100000; + + while ((c = getopt (argc, argv, "bi:hv")) != -1) + switch (c) + { + case 'b': + useBits = true; + break; + case 'i': + // Magic numbers? fuck it that's not a magic number, that's a 'real' number. + interval = atoi(optarg) * 100000; + break; + case 'h': + std::cout << "USAGE: fsbm, -b specifies bits, -i sets interval in 10ths of seconds, 1 sec default\n"; + exit(EXIT_SUCCESS); + break; + case 'v': + std::cout << "Version 1\n"; + exit(EXIT_SUCCESS); + break; + case '?': + std::cerr << "bad flag\n"; + break; + default: + exit(EXIT_FAILURE); + } + + // Catch SIGINT + signal(SIGINT, endHandler); + + + + // Create a socket (for ioctls) + int sock = socket(AF_INET, SOCK_DGRAM, 0); + if (!sock) { + std::cerr ("cannot open socket"); + exit(EXIT_FAILURE); + } + + // Initialize curses + + statistics::Reader statisticsReader; + statisticsReader.update(); + while (!quit) { + + // Update the statistics + statisticsReader.update(); + + for (statistics::Reader::Interfaces::const_iterator + interface = statisticsReader.getInterfaces().begin(); + interface != statisticsReader.getInterfaces().end(); + ++interface) { + + std::cout << interface->getName() << " ("; + formatBandwidth(interface->getReceiveSpeed(), useBits); + std::cout << ", "; + formatBandwidth(interface->getTransmitSpeed(), useBits); + std::cout << ")"; + + } + std::cout << "\n"; + usleep(interval); + + + + } + return retval; +} diff --git a/config.h b/config.h new file mode 100644 index 0000000..6b4c3e4 --- /dev/null +++ b/config.h @@ -0,0 +1,55 @@ +/* src/config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION diff --git a/fsbm.cpp b/fsbm.cpp new file mode 100644 index 0000000..1daa239 --- /dev/null +++ b/fsbm.cpp @@ -0,0 +1,133 @@ +#include "config.h" +#include "statistics.hpp" +#include <algorithm> +#include <cstdlib> +#include <cstring> +#include <iomanip> +#include <iostream> +#include <sstream> + +#include <curses.h> +#include <getopt.h> +#include <signal.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#include <net/if.h> +#include <unistd.h> + +#define PACKAGE "yo" +#define PACKAGE_STRING "yo mamma" + +// Externs +extern int optind, opterr, optopt; + +volatile bool quit = false; + +void endHandler(int signum) { + quit = true; +} + +void formatBandwidth(double bytesPerSecond, bool showBits) { + const char* prefixes[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y" }; + + // Calculate the value + double value; + const char* unit; + if (showBits){ + value = bytesPerSecond * 8; + unit = "b/s"; + } + else { + value = bytesPerSecond; + unit = "B/s"; + } + + // Choose the prefix + unsigned prefix = 0; + while (prefix < (sizeof(prefixes) / sizeof(const char*)) && value > 1000.) { + value /= 1000.; + ++prefix; + } + + // Format the string + std::cout << std::setprecision(2) << value << " " << prefixes[prefix] << unit; + +} + +int main(int argc, char **argv) { + int retval = EXIT_SUCCESS; + + // parse the command line + int c; + + bool useBits = false; + int interval = 10 * 100000; + + while ((c = getopt (argc, argv, "bi:hv")) != -1) + switch (c) + { + case 'b': + useBits = true; + break; + case 'i': + // Magic numbers? fuck it that's not a magic number, that's a 'real' number. + interval = atoi(optarg) * 100000; + break; + case 'h': + std::cout << "USAGE: fsbm, -b specifies bits, -i sets interval in 10ths of seconds, 1 sec default\n"; + exit(EXIT_SUCCESS); + break; + case 'v': + std::cout << "Version 1\n"; + exit(EXIT_SUCCESS); + break; + case '?': + std::cerr << "bad flag\n"; + break; + default: + exit(EXIT_FAILURE); + } + + // Catch SIGINT + signal(SIGINT, endHandler); + + + + // Create a socket (for ioctls) + int sock = socket(AF_INET, SOCK_DGRAM, 0); + if (!sock) { + std::cerr << "cannot open socket\n"; + exit(EXIT_FAILURE); + } + + // Initialize curses + + statistics::Reader statisticsReader; + statisticsReader.update(); + while (!quit) { + + // Update the statistics + statisticsReader.update(); + + for (statistics::Reader::Interfaces::const_iterator + interface = statisticsReader.getInterfaces().begin(); + interface != statisticsReader.getInterfaces().end(); + ++interface) { + + std::cout << interface->getName() << " ("; + formatBandwidth(interface->getReceiveSpeed(), useBits); + std::cout << ", "; + formatBandwidth(interface->getTransmitSpeed(), useBits); + std::cout << ")"; + + } + std::cout << "\n"; + usleep(interval); + + + + } + return retval; +} diff --git a/statistics.cpp b/statistics.cpp new file mode 100644 index 0000000..800a4e5 --- /dev/null +++ b/statistics.cpp @@ -0,0 +1,160 @@ +#include "config.h" +#include "statistics.hpp" +#include <algorithm> +#include <assert.h> +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> + +#include <sys/time.h> + +#include <iostream> +#include <sstream> + +#define PROC_NET_DEV "/proc/net/dev" + +namespace statistics { + +Interface::Interface(const std::string& name) : name_(name), updated_(false) {} + +class InterfaceNameMatchesPredicate { + public: + InterfaceNameMatchesPredicate(const std::string& name) : name_(name) {} + + bool operator() (const Interface& interface) const { + return name_ == interface.getName(); + } + private: + std::string name_; +}; + +class InterfaceNotUpdatedPredicate { + public: + bool operator() (const Interface& interface) const { + return !interface.getUpdated(); + } +}; + +void Interface::update(const Statistics& statistics) { + memcpy(statistics_ + 1, statistics_ + 0, sizeof(Statistics)); + memcpy(statistics_, &statistics, sizeof(Statistics)); + + const Statistics& x0 = statistics_[1]; + const Statistics& x1 = statistics_[0]; + + double timeDelta = + (x1.timestamp.tv_sec - x0.timestamp.tv_sec) * 1. + + (x1.timestamp.tv_usec - x0.timestamp.tv_usec) * .000001; + + receiveSpeed_ = (x1.rx_bytes - x0.rx_bytes) / timeDelta; + transmitSpeed_ = (x1.tx_bytes - x0.tx_bytes) / timeDelta; + + updated_ = true; +} + +void Reader::update() { + // Open /proc/net/dev + FILE *dev = fopen(PROC_NET_DEV, "r"); + if (!dev) { + std::cerr << "cannot open " << PROC_NET_DEV << "\n"; + exit(EXIT_FAILURE); + } + + try { + // Clear the 'updated' flag for all interfaces + for (Interfaces::iterator interface = interfaces_.begin(); + interface != interfaces_.end(); ++interface) + interface->setUpdated(false); + + // Read /proc/dev/net + while (!feof(dev)) { + char buf[500]; + char *name, *statistics_string; + Statistics stats; + struct timezone unused_timezone; + + // Read a line + fgets(buf, sizeof(buf), dev); + gettimeofday(&stats.timestamp, &unused_timezone); + + // Find the colon separating the name from the statistics + statistics_string = strchr(buf, ':'); + if (!statistics_string) continue; + + // Get a pointer to the statistics + *statistics_string = 0; + ++statistics_string; + + // Remove leading whitespace from the name + name = buf; + while (*name == ' ' || *name == '\t') ++name; + + // Parse the statistics + if (sscanf(statistics_string, "%Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu " + "%Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", + &stats.rx_bytes, &stats.rx_packets, + &stats.rx_errs, &stats.rx_drop, + &stats.rx_fifo, &stats.rx_frame, + &stats.rx_compressed, &stats.rx_multicast, + &stats.tx_bytes, &stats.tx_packets, + &stats.tx_errs, &stats.tx_drop, + &stats.tx_fifo, &stats.tx_frame, + &stats.tx_compressed, &stats.tx_multicast) + == 16) { + + // Find the interface with the same name + Interfaces::iterator interface + = std::find_if(interfaces_.begin(), interfaces_.end(), + InterfaceNameMatchesPredicate(name)); + + if (interface == interfaces_.end()) { + // This is a new interface; add it to the list + interfaces_.push_back(Interface(name)); + interface = interfaces_.end(); + --interface; + } + + // Update the interface + interface->update(stats); + } + } + + // Remove all interfaces for which the updated flag was not set + interfaces_.remove_if(InterfaceNotUpdatedPredicate()); + + // Close the file + fclose(dev); + } + catch (...) { + fclose(dev); + throw; + } +} + +void Interface::setUpdated(bool updated) { + updated_ = updated; +} + +bool Interface::getUpdated() const { + return updated_; +} + +const std::string& Interface::getName() const { + return name_; +} + +double Interface::getReceiveSpeed() const { + return receiveSpeed_; +} + +double Interface::getTransmitSpeed() const { + return transmitSpeed_; +} + +const Reader::Interfaces& Reader::getInterfaces() const { + return interfaces_; +} + +} // namespace statistics diff --git a/statistics.hpp b/statistics.hpp new file mode 100644 index 0000000..c916ecb --- /dev/null +++ b/statistics.hpp @@ -0,0 +1,52 @@ +#ifndef CBM_STATISTICS_H +#define CBM_STATISTICS_H + +#include <list> +#include <string> +#include <sys/time.h> + +namespace statistics { + +struct Statistics { + struct timeval timestamp; + unsigned long long rx_bytes, rx_packets, rx_errs, rx_drop, rx_fifo, + rx_frame, rx_compressed, rx_multicast, + tx_bytes, tx_packets, tx_errs, tx_drop, tx_fifo, + tx_frame, tx_compressed, tx_multicast; +}; + +class Interface { + public: + Interface(const std::string& name); + + const std::string& getName() const; + + void setUpdated(bool updated); + bool getUpdated() const; + + void update(const Statistics& statistics); + + double getReceiveSpeed() const; + double getTransmitSpeed() const; + + private: + std::string name_; + bool updated_; + Statistics statistics_[2]; + double receiveSpeed_, transmitSpeed_; +}; + +class Reader { + public: + void update(); + + typedef std::list<Interface> Interfaces; + const Interfaces& getInterfaces() const; + + private: + Interfaces interfaces_; +}; + +} // namespace statistics + +#endif |