Menu
▾
▴
[Mod-c-cvs] mod_c/src Makefile.am, 1.12, 1.13 Makefile.in, 1.12, 1.13 def_session_server.cpp, 1.11, 1.12 mod_c.c, 1.14, 1.15
|
From: Matej U. <mat...@us...> - 2006-08-22 20:32:01
|
Update of /cvsroot/mod-c/mod_c/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29734/src Modified Files: Makefile.am Makefile.in def_session_server.cpp mod_c.c Log Message: - patched 'mod_c_dss' so it works now. - added a tool in 'src/dss_tool' with which one can communicate with the default session server. Index: Makefile.in =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.in 8 Feb 2006 22:38:13 -0000 1.12 --- Makefile.in 22 Aug 2006 20:31:57 -0000 1.13 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ *************** *** 16,21 **** - SOURCES = $(libmod_c_a_SOURCES) mod_c.c $(mod_c_dss_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ --- 16,19 ---- *************** *** 88,93 **** --- 86,98 ---- SOURCES = $(libmod_c_a_SOURCES) mod_c.c $(mod_c_dss_SOURCES) DIST_SOURCES = $(libmod_c_a_SOURCES) mod_c.c $(mod_c_dss_SOURCES) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive ETAGS = etags CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ *************** *** 207,211 **** libmod_c_a_SOURCES = session_drivers.cpp lib_cache.cpp def_session_driver.cpp mod_c_LDADD = libmod_c.a ! all: all-am .SUFFIXES: --- 212,217 ---- libmod_c_a_SOURCES = session_drivers.cpp lib_cache.cpp def_session_driver.cpp mod_c_LDADD = libmod_c.a ! SUBDIRS = dss_tool ! all: all-recursive .SUFFIXES: *************** *** 364,367 **** --- 370,444 ---- uninstall-info-am: + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ *************** *** 374,381 **** tags: TAGS ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ --- 451,471 ---- tags: TAGS ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ *************** *** 390,394 **** fi ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ --- 480,484 ---- fi ctags: CTAGS ! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ *************** *** 439,458 **** fi; \ done check-am: all-am ! check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) ! installdirs: for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done ! install: install-am ! install-exec: install-exec-am ! install-data: install-data-am ! uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ --- 529,564 ---- fi; \ done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am ! check: check-recursive all-am: Makefile $(LIBRARIES) $(PROGRAMS) ! installdirs: installdirs-recursive ! installdirs-am: for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done ! install: install-recursive ! install-exec: install-exec-recursive ! install-data: install-data-recursive ! uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ *************** *** 470,479 **** @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool \ clean-noinstLIBRARIES clean-noinstPROGRAMS mostlyclean-am ! distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile --- 576,585 ---- @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." ! clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libtool \ clean-noinstLIBRARIES clean-noinstPROGRAMS mostlyclean-am ! distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile *************** *** 481,491 **** distclean-libtool distclean-tags ! dvi: dvi-am dvi-am: ! html: html-am ! info: info-am info-am: --- 587,597 ---- distclean-libtool distclean-tags ! dvi: dvi-recursive dvi-am: ! html: html-recursive ! info: info-recursive info-am: *************** *** 497,501 **** $(MAKE) $(AM_MAKEFLAGS) install-exec-hook ! install-info: install-info-am install-man: --- 603,607 ---- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook ! install-info: install-info-recursive install-man: *************** *** 503,521 **** installcheck-am: ! maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic ! mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool ! pdf: pdf-am pdf-am: ! ps: ps-am ps-am: --- 609,627 ---- installcheck-am: ! maintainer-clean: maintainer-clean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic ! mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool ! pdf: pdf-recursive pdf-am: ! ps: ps-recursive ps-am: *************** *** 523,538 **** uninstall-am: uninstall-binPROGRAMS uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-libtool clean-noinstLIBRARIES \ ! clean-noinstPROGRAMS ctags distclean distclean-compile \ ! distclean-generic distclean-libtool distclean-tags distdir dvi \ ! dvi-am html html-am info info-am install install-am \ ! install-binPROGRAMS install-data install-data-am install-exec \ ! install-exec-am install-exec-hook install-info install-info-am \ ! install-man install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-binPROGRAMS uninstall-info-am --- 629,649 ---- uninstall-am: uninstall-binPROGRAMS uninstall-info-am ! uninstall-info: uninstall-info-recursive ! ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ ! clean clean-binPROGRAMS clean-generic clean-libtool \ ! clean-noinstLIBRARIES clean-noinstPROGRAMS clean-recursive \ ! ctags ctags-recursive distclean distclean-compile \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distdir dvi dvi-am html html-am info info-am \ ! install install-am install-binPROGRAMS install-data \ ! install-data-am install-exec install-exec-am install-exec-hook \ ! install-info install-info-am install-man install-strip \ ! installcheck installcheck-am installdirs installdirs-am \ ! maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ! uninstall-binPROGRAMS uninstall-info-am Index: Makefile.am =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.am 8 Feb 2006 22:38:13 -0000 1.12 --- Makefile.am 22 Aug 2006 20:31:57 -0000 1.13 *************** *** 27,28 **** --- 27,29 ---- install-exec-hook: $(APXS) -i -a mod_c.so + SUBDIRS = dss_tool Index: mod_c.c =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/mod_c.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mod_c.c 8 Feb 2006 22:38:13 -0000 1.14 --- mod_c.c 22 Aug 2006 20:31:58 -0000 1.15 *************** *** 55,61 **** --- 55,64 ---- char noCache = 0; + // Try to load the handle to the loaded library from the cache void * handle = GetEHTMLEntry( config->ehtml_cache, r->filename ); + // Was the handle present in the cache if ( !handle ) { + // The handle wasn't there - load the library to memory if ( ( handle = dlopen( r->filename, RTLD_LAZY ) ) ) { *************** *** 74,77 **** --- 77,82 ---- } + // We have found the library that contains the EHTML application + // execute its ehtml_run function if ( handle ) { *************** *** 79,82 **** --- 84,89 ---- request_context rc = { r, config, dir_config }; retVal = _tmp( &rc ); + + // If the EHTML application wasn't loaded from the cache, close the handle if ( noCache ) dlclose( handle ); Index: def_session_server.cpp =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/def_session_server.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** def_session_server.cpp 4 Mar 2006 11:06:16 -0000 1.11 --- def_session_server.cpp 22 Aug 2006 20:31:57 -0000 1.12 *************** *** 513,517 **** { // Unlink the path for the RF_LOCAL sockets... ! return unlink( UNIX_SOCKET_ADDRESS ); } --- 513,519 ---- { // Unlink the path for the RF_LOCAL sockets... ! unlink( UNIX_SOCKET_ADDRESS ); ! // You should always succeed... ! return 0; } *************** *** 543,547 **** --- 545,552 ---- int retVal = pthread_create( &cleanerThread, &thread_attr, CleanerFunc, map ); if ( retVal != 0 ) + { + printf ("Could not create a thread in '%s' at line '%d': '%s'\n", __FILE__, __LINE__, strerror(errno)); goto finish; + } // Bind the socket *************** *** 552,556 **** --- 557,564 ---- // Has a server already been created? if ( retVal < 0 ) + { + printf ("Could not create a listening socket in '%s' at line '%d': '%s'\n", __FILE__, __LINE__, strerror(errno)); goto finish; + } else { *************** *** 558,561 **** --- 566,570 ---- if ( retVal < 0 ) { + printf ("Could not listen in '%s' at line '%d': '%s'\n", __FILE__, __LINE__, strerror(errno)); shutdown( serverHandle, SHUT_RDWR ); close( serverHandle ); *************** *** 574,577 **** --- 583,587 ---- if ( retVal != 0 ) { + printf ("Could not create a thread that would listen in '%s' at line '%d': '%s'\n", __FILE__, __LINE__, strerror(errno)); delete parms; shutdown( serverHandle, SHUT_RDWR ); |
