Browse Source

[2955] Makefile additions for new D2 files.

Thomas Markwalder 12 years ago
parent
commit
419690bf77
3 changed files with 38 additions and 5 deletions
  1. 4 0
      src/bin/d2/Makefile.am
  2. 29 5
      src/bin/d2/d2_messages.mes
  3. 5 0
      src/bin/d2/tests/Makefile.am

+ 4 - 0
src/bin/d2/Makefile.am

@@ -48,12 +48,16 @@ pkglibexec_PROGRAMS = b10-d2
 
 
 b10_d2_SOURCES  = main.cc
 b10_d2_SOURCES  = main.cc
 b10_d2_SOURCES += d2_log.cc d2_log.h
 b10_d2_SOURCES += d2_log.cc d2_log.h
+b10_d2_SOURCES += d2_process.cc d2_process.h d_process.h
 
 
 nodist_b10_d2_SOURCES = d2_messages.h d2_messages.cc
 nodist_b10_d2_SOURCES = d2_messages.h d2_messages.cc
 EXTRA_DIST += d2_messages.mes
 EXTRA_DIST += d2_messages.mes
 
 
 b10_d2_LDADD = $(top_builddir)/src/lib/log/libb10-log.la
 b10_d2_LDADD = $(top_builddir)/src/lib/log/libb10-log.la
 b10_d2_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 b10_d2_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
+b10_d2_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+b10_d2_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+b10_d2_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
 
 
 b10_d2dir = $(pkgdatadir)
 b10_d2dir = $(pkgdatadir)
 b10_d2_DATA = d2.spec
 b10_d2_DATA = d2.spec

+ 29 - 5
src/bin/d2/d2_messages.mes

@@ -14,15 +14,39 @@
 
 
 $NAMESPACE isc::d2
 $NAMESPACE isc::d2
 
 
-% D2_STARTING : process starting
+% D2_STARTING : service starting
-This is a debug message issued during a D2 process startup.
+This is a debug message issued during a D2 service startup.
 
 
 % D2_START_INFO pid: %1, verbose: %2, standalone: %3
 % D2_START_INFO pid: %1, verbose: %2, standalone: %3
-This is a debug message issued during the D2 process startup.
+This is a debug message issued during the D2 service startup.
 It lists some information about the parameters with which the
 It lists some information about the parameters with which the
 process is running.
 process is running.
 
 
-% D2_SHUTDOWN : process is performing a normal shutting down
+% D2_SHUTDOWN : service is performing a normal shutting down
-This is a debug message issued when a D2 process shuts down
+This is a debug message issued when the D2 service shuts down
 normally in response to command to stop.
 normally in response to command to stop.
 
 
+% D2PRC_SHUTDOWN : process is performing a normal shutting down
+This is a debug message issued when the D2 process shuts down
+normally in response to service directive to stop.
+
+% D2PRC_RUN_ENTER : process has entered the event loop. 
+This is a debug message issued when the D2 process enters it's
+run method. 
+
+% D2PRC_RUN_EXIT : process is exiting the event loop.
+This is a debug message issued when the D2 process exits the
+in event loop. 
+
+% D2PRC_FAILED : process experienced a fatal error.
+This is a debug message issued when the D2 process encounters an
+unrecoverable error from within the event loop.
+
+% D2PRC_CONFIGURE : new configuration received: %1
+This is a debug message issued when the D2 process configure method
+has been invoked.
+
+% D2PRC_COMMAND : command directive received, command: %1 - args: %2
+This is a debug message issued when the D2 process command method
+has been invoked.
+

+ 5 - 0
src/bin/d2/tests/Makefile.am

@@ -52,7 +52,9 @@ if HAVE_GTEST
 TESTS += d2_unittests
 TESTS += d2_unittests
 
 
 d2_unittests_SOURCES = ../d2_log.h ../d2_log.cc
 d2_unittests_SOURCES = ../d2_log.h ../d2_log.cc
+d2_unittests_SOURCES += ../d2_process.cc ../d2_process.h ../d_process.h
 d2_unittests_SOURCES += d2_unittests.cc
 d2_unittests_SOURCES += d2_unittests.cc
+d2_unittests_SOURCES += d2_process_unittests.cc
 nodist_d2_unittests_SOURCES = ../d2_messages.h ../d2_messages.cc
 nodist_d2_unittests_SOURCES = ../d2_messages.h ../d2_messages.cc
 
 
 d2_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 d2_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
@@ -60,6 +62,9 @@ d2_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 d2_unittests_LDADD = $(GTEST_LDADD)
 d2_unittests_LDADD = $(GTEST_LDADD)
 d2_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
 d2_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
+d2_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
 endif
 endif
 
 
 noinst_PROGRAMS = $(TESTS)
 noinst_PROGRAMS = $(TESTS)