Author: adrian.chadd
Date: Fri Apr 17 20:07:36 2009
New Revision: 13943
Modified:
playpen/LUSCA_HEAD_module/doc/debug-sections.txt
playpen/LUSCA_HEAD_module/libsqmod/module.h
playpen/LUSCA_HEAD_module/src/Makefile.am
playpen/LUSCA_HEAD_module/src/main.c
Log:
Link the test module code into the main application.
Modified: playpen/LUSCA_HEAD_module/doc/debug-sections.txt
==============================================================================
--- playpen/LUSCA_HEAD_module/doc/debug-sections.txt (original)
+++ playpen/LUSCA_HEAD_module/doc/debug-sections.txt Fri Apr 17 20:07:36
2009
@@ -88,3 +88,4 @@
section 82 External ACL
section 83 SSL accelerator support
section 84 Helper process maintenance
+section 85 Module management
Modified: playpen/LUSCA_HEAD_module/libsqmod/module.h
==============================================================================
--- playpen/LUSCA_HEAD_module/libsqmod/module.h (original)
+++ playpen/LUSCA_HEAD_module/libsqmod/module.h Fri Apr 17 20:07:36 2009
@@ -30,5 +30,6 @@
extern int module_init(void);
extern module_t * module_register(const char *path);
+extern void module_setup(void);
#endif
Modified: playpen/LUSCA_HEAD_module/src/Makefile.am
==============================================================================
--- playpen/LUSCA_HEAD_module/src/Makefile.am (original)
+++ playpen/LUSCA_HEAD_module/src/Makefile.am Fri Apr 17 20:07:36 2009
@@ -253,6 +253,7 @@
-L../libsqinet \
-L../libsqname \
-L../libasyncio \
+ -L../libsqmod \
@XTRA_OBJS@ \
@REPL_OBJS@ \
@STORE_OBJS@ \
@@ -263,6 +264,7 @@
@LIB_MALLOC@ \
@SSLLIB@ \
@LIB_EPOLL@ \
+ -lsqmod \
-lasyncio \
-lstmem \
-lsqdns \
@@ -315,7 +317,7 @@
data_DATA = \
mib.txt
-LDADD = -L../lib -L../libcore -L../libsqdebug -L../libmem -L../libsqname
-L../libcb -L../libhelper -L../libmime -L../libstmem -L../libiapp
-L../libhttp -L../libstat -L../libsqdns -L../libsqident -L../libsqinet
-L../libasyncio -lasyncio -lsqinet -lsqdns -lsqdebug -lcore -lmem -lsqname
-lcb -lsqident -lhelper -lmime -lstmem -liapp -lhttp -lstat -lmiscutil
@XTRA_LIBS@
+LDADD = -L../lib -L../libcore -L../libsqdebug -L../libmem -L../libsqname
-L../libcb -L../libhelper -L../libmime -L../libstmem -L../libiapp
-L../libhttp -L../libstat -L../libsqdns -L../libsqident -L../libsqinet
-L../libsqmod -L../libasyncio -lsqmod -lasyncio -lsqinet -lsqdns -lsqdebug
-lcore -lmem -lsqname -lcb -lsqident -lhelper -lmime -lstmem -liapp -lhttp
-lstat -lmiscutil @XTRA_LIBS@
EXTRA_DIST = \
cf_gen_defines \
Modified: playpen/LUSCA_HEAD_module/src/main.c
==============================================================================
--- playpen/LUSCA_HEAD_module/src/main.c (original)
+++ playpen/LUSCA_HEAD_module/src/main.c Fri Apr 17 20:07:36 2009
@@ -84,6 +84,8 @@
#include "test_access.c"
#endif
+#include "../libsqmod/module.h"
+
static void
usage(void)
{
@@ -823,10 +825,14 @@
eventLocalInit();
storeFsInit(); /* required for config parsing */
authenticateSchemeInit(); /* required for config parsing */
+ module_init();
parse_err = parseConfigFile(ConfigFile);
if (opt_parse_cfg_only)
return parse_err;
+
+ /* Initialise the registered modules at this point */
+ module_setup();
/* XXX hacks for now to setup config options in libiapp; rethink
this! -adrian */
iapp_tcpRcvBufSz = Config.tcpRcvBufsz;
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
