[#3242] Addressed comments, added ChangeLog entry

Minor cosmetic fixes.

diff --git a/ChangeLog b/ChangeLog
index 07b5aac744fba1846e3552c62179ab26e708e77f..85e74bb7c0dc0089a953969a9a1ae9a5647d12cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2204.  [func]          tmark
+       The skeleton of a new open source hook library,
+       libdhcp_perfmon.so, has been added.  The library is
+       still in development and does yet provide any functionality.
+       (Gitlab #3242)
+
 Kea 2.5.5 (development) released on January 31, 2024
 
 2203.  [build]         razvan

diff --git a/doc/sphinx/arm/logging.rst b/doc/sphinx/arm/logging.rst
index 834cdd56554c3fb2165b21d89231c514368249e5..5cdcefde4bb541a970bce87af000e98b78b8167c 100644 (file)
--- a/doc/sphinx/arm/logging.rst
+++ b/doc/sphinx/arm/logging.rst
@@ -427,7 +427,7 @@ libraries), or hook libraries (open source or premium).
    |                                  |                                       | message carried in             |
    |                                  |                                       | the packet is parsed.          |
    +----------------------------------+---------------------------------------+--------------------------------+
-   | ``kea-dhcp4.perfmon-hooks``      | :ischooklib:`libdhcp_perfmon.so`      | Used                           |
+   | ``kea-dhcp4.perfmon-hooks``,     | :ischooklib:`libdhcp_perfmon.so`      | Used                           |
    | ``kea-dhcp6.perfmon-hooks``      | open-source hook library              | to log messages related to     |
    |                                  |                                       | performan monitoring.          |
    +----------------------------------+---------------------------------------+--------------------------------+

diff --git a/src/hooks/dhcp/bootp/libloadtests/load_unload_unittests.cc b/src/hooks/dhcp/bootp/libloadtests/load_unload_unittests.cc
index 9404e39564fc5118c56dadb244db2a71c2781bce..ca27cc5077879f2dc58df32fdf9bae75afbbbfb2 100644 (file)
--- a/src/hooks/dhcp/bootp/libloadtests/load_unload_unittests.cc
+++ b/src/hooks/dhcp/bootp/libloadtests/load_unload_unittests.cc
@@ -49,7 +49,7 @@ TEST_F(BootpLibLoadTest, validLoad4) {
     validDaemonTest("kea-dhcp4");
 }
 
-// Simple V6 test that checks the library cannot by loaded by invalid daemons.
+// Simple test that checks the library cannot by loaded by invalid daemons.
 TEST_F(BootpLibLoadTest, invalidDaemonLoad) {
     invalidDaemonTest("kea-dhcp6", AF_INET6);
     invalidDaemonTest("kea-ctrl-agent");

diff --git a/src/hooks/dhcp/lease_cmds/libloadtests/load_unload_unittests.cc b/src/hooks/dhcp/lease_cmds/libloadtests/load_unload_unittests.cc
index 14255ede896f4c3dbed6b22ab40db7c5aa719128..84127b07e088b52300d4a8a185c8ea3539b6365a 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/libloadtests/load_unload_unittests.cc
+++ b/src/hooks/dhcp/lease_cmds/libloadtests/load_unload_unittests.cc
@@ -54,7 +54,7 @@ TEST_F(LeaseCmdsCbLibLoadTest, validLoad6) {
     validDaemonTest("kea-dhcp6", AF_INET6);
 }
 
-// Simple V6 test that checks the library cannot by loaded by invalid daemons.
+// Simple test that checks the library cannot by loaded by invalid daemons.
 TEST_F(LeaseCmdsCbLibLoadTest, invalidDaemonLoad) {
     invalidDaemonTest("kea-ctrl-agent");
     invalidDaemonTest("kea-dhcp-ddns");

diff --git a/src/hooks/dhcp/mysql_cb/libloadtests/load_unload_unittests.cc b/src/hooks/dhcp/mysql_cb/libloadtests/load_unload_unittests.cc
index 89102fa10d6f2594814f53c8fe8e884d1665b4e5..354e5dcfd56876a4e469a909a3fe4258acf77364 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/libloadtests/load_unload_unittests.cc
+++ b/src/hooks/dhcp/mysql_cb/libloadtests/load_unload_unittests.cc
@@ -54,7 +54,7 @@ TEST_F(MySqlCbLibLoadTest, validLoad6) {
     validDaemonTest("kea-dhcp6", AF_INET6);
 }
 
-// Simple V6 test that checks the library cannot by loaded by invalid daemons.
+// Simple test that checks the library cannot by loaded by invalid daemons.
 TEST_F(MySqlCbLibLoadTest, invalidDaemonLoad) {
     invalidDaemonTest("kea-ctrl-agent");
     invalidDaemonTest("kea-dhcp-ddns");

diff --git a/src/hooks/dhcp/perfmon/Makefile.am b/src/hooks/dhcp/perfmon/Makefile.am
index e032c66f551d94d468575675588a567c29412f70..b5b8c09e7976a3a77e9f9944dcbae5168fb5ae12 100644 (file)
--- a/src/hooks/dhcp/perfmon/Makefile.am
+++ b/src/hooks/dhcp/perfmon/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . tests libloadtests
+SUBDIRS = . libloadtests tests
 
 AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)

diff --git a/src/hooks/dhcp/perfmon/libloadtests/load_unload_unittests.cc b/src/hooks/dhcp/perfmon/libloadtests/load_unload_unittests.cc
index 981ba8db796c6138b40a2a3ee9afbc8176cc87ea..31d8cd28e573854714814147443db252c70e3e73 100644 (file)
--- a/src/hooks/dhcp/perfmon/libloadtests/load_unload_unittests.cc
+++ b/src/hooks/dhcp/perfmon/libloadtests/load_unload_unittests.cc
@@ -31,7 +31,7 @@ using namespace isc::process;
 
 namespace {
 
-/// @brief Test fixture for testing loading and unloading the stat cmds library
+/// @brief Test fixture for testing loading and unloading the perfmon library
 class PerfMonLibLoadTest : public isc::test::LibLoadTest {
 public:
     /// @brief Constructor
@@ -54,7 +54,7 @@ TEST_F(PerfMonLibLoadTest, validLoad6) {
     validDaemonTest("kea-dhcp6", AF_INET6);
 }
 
-// Simple V6 test that checks the library cannot by loaded by invalid daemons.
+// Simple test that checks the library cannot by loaded by invalid daemons.
 TEST_F(PerfMonLibLoadTest, invalidDaemonLoad) {
     invalidDaemonTest("kea-ctrl-agent");
     invalidDaemonTest("kea-dhcp-ddns");

diff --git a/src/hooks/dhcp/perfmon/perfmon.dox b/src/hooks/dhcp/perfmon/perfmon.dox
index 02552fca1b8f2fa751b3401a8667e39a909d2774..ca4f2e2126c9728acc32f8ac6f90d40675f2f1fd 100644 (file)
--- a/src/hooks/dhcp/perfmon/perfmon.dox
+++ b/src/hooks/dhcp/perfmon/perfmon.dox
@@ -25,7 +25,7 @@ PerfMon (or perfmon) is a Hook library that can be loaded by
 either kea-dhcp4 and kea-dhcp6 servers to extend them with the
 ability to track and report performance related data.
 
-The initial purpose of this library is provide supplemental data and
+The initial purpose of this library is to provide supplemental data and
 commands for monitoring the performance of kea-dhcp4 and kea-dhcp6
 servers in real time.
 

diff --git a/src/hooks/dhcp/perfmon/perfmon_log.h b/src/hooks/dhcp/perfmon/perfmon_log.h
index 70d00b273664eeaf46e2f21ccbc31a6d77a67766..2f7f10c6c8b82192f064683f3188e1c9d0b13a9a 100644 (file)
--- a/src/hooks/dhcp/perfmon/perfmon_log.h
+++ b/src/hooks/dhcp/perfmon/perfmon_log.h
@@ -16,7 +16,7 @@ namespace perfmon {
 
 extern isc::log::Logger perfmon_logger;
 
-} // end of isc::perfmon
+} // end of isc::perfmon namespace
 } // end of isc namespace
 
 

diff --git a/src/hooks/dhcp/pgsql_cb/libloadtests/load_unload_unittests.cc b/src/hooks/dhcp/pgsql_cb/libloadtests/load_unload_unittests.cc
index 2791c3dc94655184c87a26a117495e074a61758e..47b79c8d7ea522f3dfbec9caebfa1f4a43bd7838 100644 (file)
--- a/src/hooks/dhcp/pgsql_cb/libloadtests/load_unload_unittests.cc
+++ b/src/hooks/dhcp/pgsql_cb/libloadtests/load_unload_unittests.cc
@@ -54,7 +54,7 @@ TEST_F(PgSqlCbLibLoadTest, validLoad6) {
     validDaemonTest("kea-dhcp6", AF_INET6);
 }
 
-// Simple V6 test that checks the library cannot by loaded by invalid daemons.
+// Simple test that checks the library cannot by loaded by invalid daemons.
 TEST_F(PgSqlCbLibLoadTest, invalidDaemonLoad) {
     invalidDaemonTest("kea-ctrl-agent");
     invalidDaemonTest("kea-dhcp-ddns");

diff --git a/src/hooks/dhcp/stat_cmds/libloadtests/load_unload_unittests.cc b/src/hooks/dhcp/stat_cmds/libloadtests/load_unload_unittests.cc
index ff3ddf8201ac0f1a7c57dfe97562e434d5fe920f..e8027f34ba8f53cc833acd1f527c9b4400471388 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/libloadtests/load_unload_unittests.cc
+++ b/src/hooks/dhcp/stat_cmds/libloadtests/load_unload_unittests.cc
@@ -54,7 +54,7 @@ TEST_F(StatCmdsCbLibLoadTest, validLoad6) {
     validDaemonTest("kea-dhcp6", AF_INET6);
 }
 
-// Simple V6 test that checks the library cannot by loaded by invalid daemons.
+// Simple test that checks the library cannot by loaded by invalid daemons.
 TEST_F(StatCmdsCbLibLoadTest, invalidDaemonLoad) {
     invalidDaemonTest("kea-ctrl-agent");
     invalidDaemonTest("kea-dhcp-ddns");