diff --git a/doc/devel/mainpage.dox b/doc/devel/mainpage.dox index a7fd094152..ca9d8815fa 100644 --- a/doc/devel/mainpage.dox +++ b/doc/devel/mainpage.dox @@ -24,6 +24,7 @@ * - @subpage libdhcp * - @subpage libdhcpIntro * - @subpage libdhcpIfaceMgr + * - @subpage perfdhcpInternals * * @section misc Miscellaneous topics * - @subpage LoggingApi @@ -36,4 +37,4 @@ * @todo: Move this logo to the right (and possibly up). Not sure what * is the best way to do it in Doxygen, without using CSS hacks. * @image html isc-logo.png - */ \ No newline at end of file + */ diff --git a/tests/tools/perfdhcp/Makefile.am b/tests/tools/perfdhcp/Makefile.am index 7c8064ea14..d6e8c36797 100644 --- a/tests/tools/perfdhcp/Makefile.am +++ b/tests/tools/perfdhcp/Makefile.am @@ -40,3 +40,6 @@ libb10_perfdhcp___la_LIBADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink. pkglibexec_PROGRAMS = perfdhcp perfdhcp_SOURCES = perfdhcp.c + +# ... and the documentation +EXTRA_DIST = perfdhcp_internals.dox diff --git a/tests/tools/perfdhcp/perfdhcp-classes.html b/tests/tools/perfdhcp/perfdhcp-classes.html deleted file mode 100644 index d4dd2e5a9d..0000000000 --- a/tests/tools/perfdhcp/perfdhcp-classes.html +++ /dev/null @@ -1,126 +0,0 @@ - - - perfdhcp objects breakdown

perfdhcp objects breakdown

Marcin Siodelski

This is a companion document for BIND 10 version - 20120817.

Abstract

This document briefly describes C++ classes being part of the - perfdhcp tool.


Table of Contents

1. Introduction
2. Classes
CommandOptions (command_options.h .cc)
TestControl (test_control.h .cc)
StatsMgr (stats_mgr.h)
PerfPkt4, PerfPkt6 (perf_pkt4.h .cc, perf_pkt6.h .cc)
LocalizedOption (localized_option.h)
PktTransform (pkt_transform.h .cc)

Chapter 1. Introduction

- The source code of perfdhcp tool has been refactored from C to C++. - There is a bunch of new C++ classes. in the refactored code. - All of them are well documented in Doxygen. This document is - limited to brief overview of major classes to help understand - their purpose. -

Chapter 2. Classes

CommandOptions (command_options.h .cc)

- CommandOptions is a singleton class that parses perfdhcp command line - parameters and initializes its members accordingly. If parsed parameters - are invalid the parser function throws exception. -

-main(int argc, char* argv[]) {
-try {
-    CommandOptions& command_options = CommandOptions::instance();
-    command_options.parse(argc, argv);
-catch(const Exception& e) {
-    ...
-}
-...
-}
-        

- If argument parsing is successful than parsed values can be read from - CommandOptions singleton from any class or function in the program: -

-
-...
-int rate = CommandOptions::instance().getRate();
-...
-
-        

-

TestControl (test_control.h .cc)

- TestControl singleton is responsible for test execution coordination. - It relies on CommandOptions object to get all required test parameters. For - this reason CommandOptions has to be initialized and CommandOptions::parse() - has to be called prior to calling TestControl::run(). The latter function - performs initialization of TestControl internals and execues the main program - loop. The TestControl::run() function performs the following major operations: -

  1. check if command line has been parsed,

  2. prints diagnostics if specified from command line,

  3. register DHCP options factory functions,

  4. read packet templates from files,

  5. initialize Statistics Manager object,

  6. set interrupt signal handler (handle ^C),

  7. open and close socket for communication with server,

  8. coordinate sending and receiving packets,

  9. coordinate intermediate reporting,

  10. prints test statistics.

-

- TestControl is a singleton object so there is one sole instance of - it throughout the program. In order to allow running performance test - multiple times (using different command line options) with single instance - of the TestControl object it uses TestControl::reset() function internally - to reset state of the class members. Also, functions that initialize - various class members like Statistics Manager will release any objects - existing from previous test runs. -

StatsMgr (stats_mgr.h)

- StatsMgr is a class that holds all performance statistics gathered throughout - the test execution. Statistics Manager is created in TestControl. The - TestControl class posts all sent and received packets to StatsMgr. - Collected packets are used to match packets received from the server with - corresponding sent packets, calculate round trip time, number of packet - drops etc. Apart from the standard counters implemented in StatsMgr, - custom (named) counters can be specified and incremented by the calling - class. StatsMgr also exposes multiple functions that print gathered - statistics into the console. -

- The StatsMgr is a template class that takes Pkt4, Pkt6, PerfPkt4 or - PerfPkt6 as a typename. The instance of the StatsMgr can be created - as follows: -

-
-typedef StatsMgr<Pkt4> StatsMgr4;
-StatsMgr4 stats_mgr4 = boost::shared_ptr<StatsMgr4>(new StatsMgr4());
-try {
-    stats_mgr->addExchangeStats(StatsMgr4::XCHG_DO);
-} catch(const Exception& e) {
-    std::cout << e.what() << std::endl;
-}
-
-        

- The StatsMgr instance created in the example above will be used for - DHCPv4 testing (collect DHCPv4 packets) and will be configured to - monitor statistics for DISCOVER-OFFER packet exchanges. -

PerfPkt4, PerfPkt6 (perf_pkt4.h .cc, perf_pkt6.h .cc)

- The PerfPkt4 and PerfPkt6 classes are derived from dhcp::Pkt4 and - dhcp::Pkt6 (src/lib/dhcp). They extend parent class functionality - by adding support for template files. The instance of these classes - can be created using raw buffer (read from packet template file). - Once packet object is initialized it is possible to replace - parts of the on-wire data by using LocalizedOption mechanism. -

LocalizedOption (localized_option.h)

- LocalizedOption derives from dhcp::Option class. It represents the - DHCP option (v4 or v6) to be placed at specified position in the - packet buffer (see the section called “PerfPkt4, PerfPkt6 (perf_pkt4.h .cc, perf_pkt6.h .cc)”). Such option is added - to option collection in PerfPkt4 or PerfPkt6 object and when any of - PerfPktX::rawPack() function is called their content is stored in - the packet output buffer at the position pointed to by - LocalizedOption object. The LocalizedOption also allows to read the - on wire data in received packet at the specified position. In this - case LocalizedOption has to be created and added to recived packet. - When PerfPktX::rawUnpack() is called the contents of the buffer - will be read and stored in LocalizedOption object for further - processing. -

- The following code shows how to create a packet from (template) - buffer and replace option data in the buffer with LocalizedOption. -

-
-OptionBuffer buf;
-// fill buf with data here.
-...
-boost::scoped_ptr<PerfPkt4> pkt(new PerfPkt4(&buf[0], buf.size());
-const size_t offset_hostname = 240;
-OptionBuffer vec_hostname;
-// fill the hostname vector with data
-...
-LocalizedOptionPtr opt_hostname(new LocalizedOption(Option::V4, DHO_HOST_NAME, vec_hostname,
-                                                    offset_hostname));
-pkt->addOption(opt_hostname);
-// by calling rawPack() we replace packet contents with option contents at
-// buffer position 240.
-pkt->rawPack();
-
-        

-

PktTransform (pkt_transform.h .cc)

- This helper class contains the static functions to pack and unpack - DHCP options (specifically LocalizedOption) to and from the packet - buffer. This logic has been moved away from PerfPkt4 and PerfPkt6 - classes to PktTransform because PerfPktX classes share the logic - here. -

\ No newline at end of file diff --git a/tests/tools/perfdhcp/perfdhcp-classes.xml b/tests/tools/perfdhcp/perfdhcp-classes.xml deleted file mode 100644 index 8dda8b72a4..0000000000 --- a/tests/tools/perfdhcp/perfdhcp-classes.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - -%version; -]> - - - - - - - - perfdhcp objects breakdown - - - - 2012 - Internet Systems Consortium, Inc. ("ISC") - - - Marcin - Siodelski - - - This document briefly describes C++ classes being part of the - perfdhcp tool. - - - This is a companion document for BIND 10 version - &__VERSION__;. - - - - - Introduction - - The source code of perfdhcp tool has been refactored from C to C++. - There is a bunch of new C++ classes. in the refactored code. - All of them are well documented in Doxygen. This document is - limited to brief overview of major classes to help understand - their purpose. - - - - Classes -
- CommandOptions (command_options.h .cc) - - CommandOptions is a singleton class that parses perfdhcp command line - parameters and initializes its members accordingly. If parsed parameters - are invalid the parser function throws exception. - - - - If argument parsing is successful than parsed values can be read from - CommandOptions singleton from any class or function in the program: - - - - -
-
- TestControl (test_control.h .cc) - - TestControl singleton is responsible for test execution coordination. - It relies on CommandOptions object to get all required test parameters. For - this reason CommandOptions has to be initialized and CommandOptions::parse() - has to be called prior to calling TestControl::run(). The latter function - performs initialization of TestControl internals and execues the main program - loop. The TestControl::run() function performs the following major operations: - - check if command line has been parsed, - prints diagnostics if specified from command line, - register DHCP options factory functions, - read packet templates from files, - initialize Statistics Manager object, - set interrupt signal handler (handle ^C), - open and close socket for communication with server, - coordinate sending and receiving packets, - coordinate intermediate reporting, - prints test statistics. - - - - TestControl is a singleton object so there is one sole instance of - it throughout the program. In order to allow running performance test - multiple times (using different command line options) with single instance - of the TestControl object it uses TestControl::reset() function internally - to reset state of the class members. Also, functions that initialize - various class members like Statistics Manager will release any objects - existing from previous test runs. - -
-
- StatsMgr (stats_mgr.h) - - StatsMgr is a class that holds all performance statistics gathered throughout - the test execution. Statistics Manager is created in TestControl. The - TestControl class posts all sent and received packets to StatsMgr. - Collected packets are used to match packets received from the server with - corresponding sent packets, calculate round trip time, number of packet - drops etc. Apart from the standard counters implemented in StatsMgr, - custom (named) counters can be specified and incremented by the calling - class. StatsMgr also exposes multiple functions that print gathered - statistics into the console. - - - The StatsMgr is a template class that takes Pkt4, Pkt6, PerfPkt4 or - PerfPkt6 as a typename. The instance of the StatsMgr can be created - as follows: - - StatsMgr4; -StatsMgr4 stats_mgr4 = boost::shared_ptr(new StatsMgr4()); -try { - stats_mgr->addExchangeStats(StatsMgr4::XCHG_DO); -} catch(const Exception& e) { - std::cout << e.what() << std::endl; -} -]]> - - The StatsMgr instance created in the example above will be used for - DHCPv4 testing (collect DHCPv4 packets) and will be configured to - monitor statistics for DISCOVER-OFFER packet exchanges. - -
-
- PerfPkt4, PerfPkt6 (perf_pkt4.h .cc, perf_pkt6.h .cc) - - The PerfPkt4 and PerfPkt6 classes are derived from dhcp::Pkt4 and - dhcp::Pkt6 (src/lib/dhcp). They extend parent class functionality - by adding support for template files. The instance of these classes - can be created using raw buffer (read from packet template file). - Once packet object is initialized it is possible to replace - parts of the on-wire data by using LocalizedOption mechanism. - -
-
- LocalizedOption (localized_option.h) - - LocalizedOption derives from dhcp::Option class. It represents the - DHCP option (v4 or v6) to be placed at specified position in the - packet buffer (see ). Such option is added - to option collection in PerfPkt4 or PerfPkt6 object and when any of - PerfPktX::rawPack() function is called their content is stored in - the packet output buffer at the position pointed to by - LocalizedOption object. The LocalizedOption also allows to read the - on wire data in received packet at the specified position. In this - case LocalizedOption has to be created and added to recived packet. - When PerfPktX::rawUnpack() is called the contents of the buffer - will be read and stored in LocalizedOption object for further - processing. - - - The following code shows how to create a packet from (template) - buffer and replace option data in the buffer with LocalizedOption. - - pkt(new PerfPkt4(&buf[0], buf.size()); -const size_t offset_hostname = 240; -OptionBuffer vec_hostname; -// fill the hostname vector with data -... -LocalizedOptionPtr opt_hostname(new LocalizedOption(Option::V4, DHO_HOST_NAME, vec_hostname, - offset_hostname)); -pkt->addOption(opt_hostname); -// by calling rawPack() we replace packet contents with option contents at -// buffer position 240. -pkt->rawPack(); -]]> - - -
-
- PktTransform (pkt_transform.h .cc) - - This helper class contains the static functions to pack and unpack - DHCP options (specifically LocalizedOption) to and from the packet - buffer. This logic has been moved away from PerfPkt4 and PerfPkt6 - classes to PktTransform because PerfPktX classes share the logic - here. - -
-
-
diff --git a/tests/tools/perfdhcp/perfdhcp_internals.dox b/tests/tools/perfdhcp/perfdhcp_internals.dox new file mode 100644 index 0000000000..c5a39c8715 --- /dev/null +++ b/tests/tools/perfdhcp/perfdhcp_internals.dox @@ -0,0 +1,172 @@ +// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC") +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +// PERFORMANCE OF THIS SOFTWARE. + +/// @namespace perfdhcp +/// @page perfdhcpInternals perfdhcp Internals +/// +/// The perfdhcp utility provides a way of measuring the performance of +/// DHCP servers by generating large amounts of traffic. Written in C++, +/// its use is described in detail in the DHCP Performance Guide. +/// +/// This document is aimed at people wishing to understand the internals +/// of the perfdhcp program. It describes the major components in the +/// utility and their interaction. +/// +/// @section perfdhcpClasses perfdhcp Classes +/// +/// @subsection perfdhcpCommandOptions CommandOptions (Command Options) +/// +/// isc::perfdhcp::CommandOptions is a singleton class that parses +/// the perfdhcp command line parameters and initializes its members +/// accordingly. If the parameters are invalid, the parser method throws +/// an exception. Usage is simple: +/// +/// @code int main(int argc, char* argv[]) { +/// try { +/// CommandOptions& command_options = CommandOptions::instance(); +/// command_options.parse(argc, argv); +/// } catch(const Exception& e) { +/// ... +/// } +/// @endcode +/// +/// If the argument parsing is successful, the parsed values can be read +/// from the isc::perfdhcp::CommandOptions singleton from any class or +/// function in the program, e.g. +/// +/// @code +/// int rate = CommandOptions::instance().getRate(); +/// @endcode +/// +/// @subsection perfdhcpTestControl TestControl (Test Control) +/// +/// The isc::perfdhcp::TestControl singleton is responsible +/// for test execution coordination. It relies on the +/// isc::perfdhcp::CommandOptions object to get all required test +/// parameters and for this reason, isc::perfdhcp::CommandOptions has +/// to be initialized and isc::perfdhcp::CommandOptions::parse() called +/// prior to calling isc::perfdhcp::TestControl::run(). +/// +/// isc::perfdhcp::TestControl::run() performs initialization of +/// isc::perfdhcp::TestControl then executes the main program loop. In +/// detail, isc::perfdhcp::TestControl::run() performs the following +/// major operations: +/// +/// -# check if the command line has been parsed, +/// -# print diagnostics if specified from command line, +/// -# register DHCP options factory functions, +/// -# read packet templates from files, +/// -# initialize the isc::perfdhcp::StatisticsManager object, +/// -# set interrupt signal handler (handle ^C), +/// -# open and close socket for communication with server, +/// -# coordinate sending and receiving packets, +/// -# coordinate intermediate reporting, +/// -# prints test statistics. +/// +/// isc::perfdhcp::TestControl is a singleton object, so there is one sole +/// instance of it throughout the program. In order to allow the running +/// of unit tests, where a single instance of isc::perfdhcp::TestControl +/// is used multiple times with different command line options, a +/// isc::perfdhcp::TestControl::reset() function is provided to reset +/// the state of the class members. Also, functions that initialize +/// various class members (such as Statistics Manager) will release +/// any objects from previous test runs. +/// +/// @subsection perfStatsMgr StatsMgr (Statistics Manager) +/// +/// isc::perfdhcp::StatsMgr is a class that holds all performance +/// statistics gathered throughout the test execution and is created +/// in isc::perfdhcp::TestControl. isc::perfdhcp::TestControl posts all +/// sent and received packets to isc::perfdhcp::StatsMgr: outgoing packets +/// are recorded and incoming packets are matched with the corresponding +/// outgoing packer to calculate calculate round trip time, number of +/// packet drops etc. Apart from the standard counters implemented in +/// isc::perfdhcp::StatsMgr, custom (named) counters can be specified and +/// incremented by the calling class. isc::perfdhcp::StatsMgr also exposes +/// multiple functions that print gathered statistics into the console. +/// +/// isc::perfdhcp::StatsMgr is a template class that takes an +/// isc::dhcp::Pkt4, isc::dhcp::Pkt6, isc::perfdhcp::PerfPkt4 +/// or isc::perfdhcp::PerfPkt6 as a typename. An instance of +/// isc::perfdhcp::StatsMgr can be created by: +/// +/// @code +/// typedef StatsMgr StatsMgr4; StatsMgr4 stats_mgr4 = +/// boost::shared_ptr(new StatsMgr4()); try { +/// stats_mgr->addExchangeStats(StatsMgr4::XCHG_DO); +/// } catch(const Exception& e) { +/// std::cout << e.what() << std::endl; +/// } +/// @endcode +/// +/// The isc::perfdhcp::StatsMgr instance created in the example above will be used +/// for DHCPv4 testing (i.e. to collect DHCPv4 packets) and will be +/// configured to monitor statistics for DISCOVER-OFFER packet exchanges. +/// +/// @subsection perfdhcpPkt PerfPkt4 and PerfPkt6 +/// +/// The isc::perfdhcp::PerfPkt4 and isc::perfdhcp::PerfPkt6 classes +/// are derived from isc::dhcp::Pkt4 and isc::dhcp::Pkt6. They extend +/// the parent class functionality by adding support for template +/// files. Instances of these classes can be created using a raw buffer +/// (read from a packet template file). Once the packet object is +/// initialized, it is possible to replace parts of the on-wire data by +/// using the isc::perfdhcp::LocalizedOption mechanism. +/// +/// @subsection perfdhcpLocalizedOption LocalizedOption (Localized Option) +/// +/// isc::perfdhcp::LocalizedOption derives from the isc::dhcp::Option +/// class. It represents the DHCP option (v4 or v6) to be +/// placed at specified position in the packet buffer (see @ref +/// perfdhcpPkt). Such an option is added to the option collection in +/// a isc::perfdhcp::PerfPkt4 or isc::perfdhcp::PerfPkt6 object; when +/// any of PerfPktX::rawPack() functions are called their content is +/// stored in the packet output buffer at the position pointed to by +/// the isc::perfdhcp::LocalizedOption object. +/// +/// isc::perfdhcp::LocalizedOption also allows the reading of the +/// on wire data in received packet at the specified position. In +/// this case, isc::perfdhcp::LocalizedOption has to be created and +/// added to the received packet. When PerfPktX::rawUnpack() is +/// called, the contents of the buffer will be read and stored in a +/// isc::perfdhcp::LocalizedOption object for further processing. +/// +/// The following code shows how to create a packet from a +/// (template) buffer and replace option data in the buffer with +/// isc::perfdhcp::LocalizedOption. +/// +/// @code +/// OptionBuffer buf; // fill buf with data here. ... +/// boost::scoped_ptr pkt(new PerfPkt4(&buf[0], buf.size()); +/// const size_t offset_hostname = 240; +/// OptionBuffer vec_hostname; +/// // fill the hostname vector with data ... +/// LocalizedOptionPtr opt_hostname(new LocalizedOption(Option::V4, +/// DHO_HOST_NAME, +/// vec_hostname, +/// offset_hostname)); +/// pkt->addOption(opt_hostname); +/// // by calling rawPack() we replace the packet contents with option +/// // contents at buffer position 240. +/// pkt->rawPack(); +/// @endcode +/// +/// @subsection perfdhcpPktTransform PktTransform (Packet Transform) +/// +/// The isc::perfdhcp::PktTransform helper class contains the +/// static functions to pack and unpack DHCP options (specifically +/// isc::perfdhcp::LocalizedOption) to and from the packet buffer. This +/// logic has been moved away from isc::perfdhcp::PerfPkt4 and +/// isc::perfdhcp::PerfPkt6 classes to isc::perfdhcp::PktTransform +/// because PerfPktX classes share the logic here.