- clhp-cvs@lists.common-lisp.net - mailman3.common-lisp.net

[clhp-cvs] CVS update: clhp/mod_clhp.c
by Anthony Ventimiglia 12 Nov '03

12 Nov '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv7108 Modified Files: mod_clhp.c Log Message: Got the module working !!! it needs refining, but it works !!!! Now it's time to cook. Date: Wed Nov 12 15:44:38 2003 Author: aventimiglia Index: clhp/mod_clhp.c diff -u clhp/mod_clhp.c:1.2 clhp/mod_clhp.c:1.3 --- clhp/mod_clhp.c:1.2 Tue Nov 11 20:31:25 2003 +++ clhp/mod_clhp.c Wed Nov 12 15:44:38 2003 @@ -1,4 +1,4 @@ -/* $Id: mod_clhp.c,v 1.2 2003/11/12 01:31:25 aventimiglia Exp $ +/* $Id: mod_clhp.c,v 1.3 2003/11/12 20:44:38 aventimiglia Exp $ CLHP the Common Lisp Hypertext Preprocessor (C) 2003 Anthony J Ventimiglia @@ -33,6 +33,14 @@ #define HUGE_STRING_LEN 65000 #endif +// AP_CALL_EXEC does not properly pass it's arguments +#define BROKEN_AP_CALL_EXEC 1 + +#define LISP_COMMAND "/usr/bin/lisp" +#define LISP_OPTIONS "-noinit -nositeinit -quiet -batch" +#define LISP_CORE "-core /usr/lib/cmucl/clhp.core" +#define LISP_EVAL "-eval '(clhp:parse (cdr (assoc :script_filename ext:*environment-list*)))(quit)'" + typedef struct _child { request_rec *req; } child_stuff; @@ -45,24 +53,25 @@ child->req->subprocess_env ); int child_pid; - child->req->args = ap_pstrdup ( child->req->pool, - "-noinit -quiet -core /usr/lib/cmucl/clhp.core" ); - +#ifndef BROKEN_AP_CALL_EXEC + child->req->args = ap_psprintf ( child->req->pool, "%s %s %s", LISP_OPTIONS, + LISP_CORE, LISP_EVAL ); ap_cleanup_for_exec (); - child_pid = ap_call_exec ( child->req, pinfo, "/usr/bin/lisp", env, 1 ); - - return (0); -} - -static void send_to_lisp ( BUFF *out_buffer, const char *str ) -{ - ap_bwrite ( out_buffer, str, strlen ( str )); - ap_bflush ( out_buffer ); -} - -static void close_lisp ( BUFF *out_buff ) -{ - send_to_lisp ( out_buff, "(quit)" ); + child_pid = ap_call_exec ( child->req, pinfo, LISP_COMMAND, env, 1 ); +#else + char *command = ap_psprintf (child->req->pool, "%s %s %s %s", LISP_COMMAND, + LISP_OPTIONS, LISP_CORE, LISP_EVAL ); + ap_cleanup_for_exec (); + child_pid = ap_call_exec ( child->req, pinfo, command, env, 1 ); +#endif + +#ifdef WIN32 + return ( child_pid ); +#else + exit ( 0 ); + // Should not get here + return 0; +#endif } static int Handler ( request_rec *req ) @@ -70,9 +79,6 @@ BUFF *lisp_out, *lisp_in; child_stuff child; - req->content_type = "text/plain"; - ap_send_http_header ( req ); - ap_add_common_vars ( req ); ap_add_cgi_vars ( req ); child.req = req; @@ -81,25 +87,10 @@ kill_always, &lisp_out, &lisp_in, NULL )) return HTTP_INTERNAL_SERVER_ERROR; - ap_hard_timeout ( "Hard Timeout", req ); - - // Debugging output - ap_rputs ( "-----------------\n", child.req ); - ap_rprintf ( child.req, "ARGS: %s\n-------------\n", child.req->args ); - - - send_to_lisp ( lisp_out, "(mapcar #'print ext:*command-line-strings*)"); - send_to_lisp ( lisp_out, "(progn (loop for f from 1 to 50 do (format t \"-\")) (terpri))" ); - send_to_lisp ( lisp_out, "(mapcar #'print ext:*environment-list*)" ); - - - close_lisp ( lisp_out ); + // ap_hard_timeout ( "Hard Timeout", req ); ap_bclose ( lisp_out ); - ap_send_fb ( lisp_in, req ); ap_bclose ( lisp_in ); - - ap_rputs ( "Done", req ); ap_child_terminate ( req ); return OK;

1 0

[clhp-cvs] CVS update: clhp/mod_clhp.c
by Anthony Ventimiglia 12 Nov '03

12 Nov '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv1425 Modified Files: mod_clhp.c Log Message: Getting nowhere slowly Date: Tue Nov 11 20:31:26 2003 Author: aventimiglia Index: clhp/mod_clhp.c diff -u clhp/mod_clhp.c:1.1 clhp/mod_clhp.c:1.2 --- clhp/mod_clhp.c:1.1 Wed Oct 29 16:34:44 2003 +++ clhp/mod_clhp.c Tue Nov 11 20:31:25 2003 @@ -1,4 +1,4 @@ -/* $Id: mod_clhp.c,v 1.1 2003/10/29 21:34:44 aventimiglia Exp $ +/* $Id: mod_clhp.c,v 1.2 2003/11/12 01:31:25 aventimiglia Exp $ CLHP the Common Lisp Hypertext Preprocessor (C) 2003 Anthony J Ventimiglia @@ -29,8 +29,6 @@ #include "util_script.h" #include <string.h> -#define DEBUG_CLHP 1 - #ifndef HUGE_STRING_LEN #define HUGE_STRING_LEN 65000 #endif @@ -47,23 +45,12 @@ child->req->subprocess_env ); int child_pid; -#ifdef DEBUG_CLHP - FILE *dbg = ap_pfopen ( child->req->pool, "/tmp/clhp.debug", "w" ); - int i; -#endif + child->req->args = ap_pstrdup ( child->req->pool, + "-noinit -quiet -core /usr/lib/cmucl/clhp.core" ); -#ifdef DEBUG_CLHP - fprintf ( dbg, "run_lisp: env:\n" ); - for ( i = 0; env[i]; ++i ) - fprintf ( dbg, "\t'%s'\n", env[i] ); - fprintf ( dbg, "\nargs:\t\"%s\"\n", child->req->args ); - ap_pfclose ( child->req->pool, dbg ); -#endif - - child->req->args = "-noinit -quiet -core /usr/lib/cmucl/clhp.core"; ap_cleanup_for_exec (); child_pid = ap_call_exec ( child->req, pinfo, "/usr/bin/lisp", env, 1 ); - + return (0); } @@ -96,7 +83,16 @@ ap_hard_timeout ( "Hard Timeout", req ); + // Debugging output + ap_rputs ( "-----------------\n", child.req ); + ap_rprintf ( child.req, "ARGS: %s\n-------------\n", child.req->args ); + + + send_to_lisp ( lisp_out, "(mapcar #'print ext:*command-line-strings*)"); + send_to_lisp ( lisp_out, "(progn (loop for f from 1 to 50 do (format t \"-\")) (terpri))" ); send_to_lisp ( lisp_out, "(mapcar #'print ext:*environment-list*)" ); + + close_lisp ( lisp_out ); ap_bclose ( lisp_out );

1 0

[clhp-cvs] CVS update: clhp/config/lispc.lisp
by Anthony Ventimiglia 10 Nov '03

10 Nov '03

Update of /project/clhp/cvsroot/clhp/config In directory common-lisp.net:/tmp/cvs-serv20465/config Modified Files: lispc.lisp Log Message: Only loads lisp-init at compile-time Date: Mon Nov 10 14:21:25 2003 Author: aventimiglia Index: clhp/config/lispc.lisp diff -u clhp/config/lispc.lisp:1.5 clhp/config/lispc.lisp:1.6 --- clhp/config/lispc.lisp:1.5 Mon Nov 10 10:39:04 2003 +++ clhp/config/lispc.lisp Mon Nov 10 14:21:25 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: lispc.lisp,v 1.5 2003/11/10 15:39:04 aventimiglia Exp $") + "$Id: lispc.lisp,v 1.6 2003/11/10 19:21:25 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -20,7 +20,7 @@ ;; ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ -(eval-when (:load-toplevel :compile-toplevel) +(eval-when (:compile-toplevel) (load "config/lisp-init")) ;; This isn't really necessary, but it creates an exit code if there

1 0

[clhp-cvs] CVS update: clhp/config/lispc.lisp clhp/config/build-core.lisp
by Anthony Ventimiglia 10 Nov '03

10 Nov '03

Update of /project/clhp/cvsroot/clhp/config In directory common-lisp.net:/tmp/cvs-serv21815/config Modified Files: lispc.lisp build-core.lisp Log Message: Fixed path to lisp-init.lisp Date: Mon Nov 10 10:39:04 2003 Author: aventimiglia Index: clhp/config/lispc.lisp diff -u clhp/config/lispc.lisp:1.4 clhp/config/lispc.lisp:1.5 --- clhp/config/lispc.lisp:1.4 Mon Nov 10 10:37:04 2003 +++ clhp/config/lispc.lisp Mon Nov 10 10:39:04 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: lispc.lisp,v 1.4 2003/11/10 15:37:04 aventimiglia Exp $") + "$Id: lispc.lisp,v 1.5 2003/11/10 15:39:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -21,7 +21,7 @@ ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ (eval-when (:load-toplevel :compile-toplevel) - (load "lisp-init")) + (load "config/lisp-init")) ;; This isn't really necessary, but it creates an exit code if there ;; is a compile-time error, making make aware of the problem, and not Index: clhp/config/build-core.lisp diff -u clhp/config/build-core.lisp:1.5 clhp/config/build-core.lisp:1.6 --- clhp/config/build-core.lisp:1.5 Mon Nov 10 10:37:04 2003 +++ clhp/config/build-core.lisp Mon Nov 10 10:39:04 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: build-core.lisp,v 1.5 2003/11/10 15:37:04 aventimiglia Exp $") + "$Id: build-core.lisp,v 1.6 2003/11/10 15:39:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -34,7 +34,7 @@ ;; not subject to change (eval-when (:load-toplevel :compile-toplevel) - (load "lisp-init")) + (load "config/lisp-init")) (in-package "USER")

1 0

[clhp-cvs] CVS update: clhp/config/lispc.lisp clhp/config/build-core.lisp
by Anthony Ventimiglia 10 Nov '03

10 Nov '03

Update of /project/clhp/cvsroot/clhp/config In directory common-lisp.net:/tmp/cvs-serv20475/config Modified Files: lispc.lisp build-core.lisp Log Message: Addedd loading of lisp-init Date: Mon Nov 10 10:37:04 2003 Author: aventimiglia Index: clhp/config/lispc.lisp diff -u clhp/config/lispc.lisp:1.3 clhp/config/lispc.lisp:1.4 --- clhp/config/lispc.lisp:1.3 Wed Oct 15 08:50:52 2003 +++ clhp/config/lispc.lisp Mon Nov 10 10:37:04 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: lispc.lisp,v 1.3 2003/10/15 12:50:52 aventimiglia Exp $") + "$Id: lispc.lisp,v 1.4 2003/11/10 15:37:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -20,6 +20,8 @@ ;; ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ +(eval-when (:load-toplevel :compile-toplevel) + (load "lisp-init")) ;; This isn't really necessary, but it creates an exit code if there ;; is a compile-time error, making make aware of the problem, and not Index: clhp/config/build-core.lisp diff -u clhp/config/build-core.lisp:1.4 clhp/config/build-core.lisp:1.5 --- clhp/config/build-core.lisp:1.4 Fri Oct 17 08:58:03 2003 +++ clhp/config/build-core.lisp Mon Nov 10 10:37:04 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: build-core.lisp,v 1.4 2003/10/17 12:58:03 aventimiglia Exp $") + "$Id: build-core.lisp,v 1.5 2003/11/10 15:37:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -32,6 +32,9 @@ ;; This is a somewhat modified version of the config.lisp program distributed ;; with cmucl. config.lisp could have been used, but this is automatic and ;; not subject to change + +(eval-when (:load-toplevel :compile-toplevel) + (load "lisp-init")) (in-package "USER")

1 0

[clhp-cvs] CVS update: clhp/config/lisp-init.lisp
by Anthony Ventimiglia 10 Nov '03

10 Nov '03

Update of /project/clhp/cvsroot/clhp/config In directory common-lisp.net:/tmp/cvs-serv18751/config Modified Files: lisp-init.lisp Log Message: Commented out example code for Debian Date: Mon Nov 10 10:33:29 2003 Author: aventimiglia Index: clhp/config/lisp-init.lisp diff -u clhp/config/lisp-init.lisp:1.1 clhp/config/lisp-init.lisp:1.2 --- clhp/config/lisp-init.lisp:1.1 Mon Nov 10 10:32:16 2003 +++ clhp/config/lisp-init.lisp Mon Nov 10 10:33:29 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: lisp-init.lisp,v 1.1 2003/11/10 15:32:16 aventimiglia Exp $") + "$Id: lisp-init.lisp,v 1.2 2003/11/10 15:33:29 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -24,5 +24,5 @@ ;; Any code required at startup time for cmucl should be added here. ;; For example, On a Debian system you may need this to load ASDF -(eval-when (:load-toplevel :compile-toplevel) - (load "/usr/share/common-lisp/source/asdf/asdf.lisp")) +;(eval-when (:load-toplevel :compile-toplevel) +; (load "/usr/share/common-lisp/source/asdf/asdf.lisp"))

1 0

[clhp-cvs] CVS update: clhp/config/lisp-init.lisp
by Anthony Ventimiglia 10 Nov '03

10 Nov '03

Update of /project/clhp/cvsroot/clhp/config In directory common-lisp.net:/tmp/cvs-serv18547/config Added Files: lisp-init.lisp Log Message: Startup file for cmucl Date: Mon Nov 10 10:32:16 2003 Author: aventimiglia

1 0

[clhp-cvs] CVS update: clhp/Makefile clhp/ChangeLog
by Anthony Ventimiglia 31 Oct '03

31 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv27338 Modified Files: Makefile ChangeLog Log Message: Addedd rules for mod_clhp, but it will not yet be included in the real distribution, also removed tests/ from dist tarball. Date: Thu Oct 30 21:27:12 2003 Author: aventimiglia Index: clhp/Makefile diff -u clhp/Makefile:1.15 clhp/Makefile:1.16 --- clhp/Makefile:1.15 Fri Oct 17 08:58:04 2003 +++ clhp/Makefile Thu Oct 30 21:27:11 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.15 2003/10/17 12:58:04 aventimiglia Exp $ +# $Id: Makefile,v 1.16 2003/10/31 02:27:11 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -47,6 +47,9 @@ # path to tar TAR=/bin/tar +# path to apxs +APXS=/usr/sbin/apxs + DIRMODE=0775 # mode for cmucl dirs FMODE=0664 # mode for installed files @@ -59,19 +62,25 @@ BUILD_CORE=config/build-core.x86f BINS=start-clcgi.x86f -SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp package.lisp clhp.asd +APACHE_MOD=mod_clhp.so +SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp package.lisp clhp.asd mod_clhp.c CORE=clhp.core LISPCBIN=config/lispc.x86f RUNCGI=config/runclcgi TESTS=config/binfmt-test.clcgi DOCS=COPYING INSTALL ChangeLog NEWS README TODO -SUBDIRS=config examples tests +DIST_SUBDIRS=config examples +NON_DIST_SUBDIRS=tests RECURSIVE_SUBDIRS = examples tests EXTRADIST=config/binfmt-test.lisp config/build-core.lisp config/lispc.lisp \ config/runclcgi.src examples/Makefile examples/clhp-test.lisp \ - examples/index.clhp examples/test.lisp Makefile tests/Makefile \ - tests/cgi-test.lisp tests/test-suite.lisp + examples/index.clhp examples/test.lisp Makefile + +NON_DIST= tests/Makefile tests/cgi-test.lisp tests/test-suite.lisp + +CLEAN_TARGETS=$(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) $(TESTS) $(TARBALL) \ + $(APACHE_MOD) mod_clhp.o DISTFILES=$(SOURCES) $(DOCS) $(EXTRADIST) @@ -85,7 +94,7 @@ # makefile most likeley will not match the cvs version ID in # clhp.lisp, since they depend on their own file's cvs date keyword. -CVSID=$(shell echo $Date: 2003/10/17 12:58:04 $ | \ +CVSID=$(shell echo $Date: 2003/10/31 02:27:11 $ | \ awk '{print $$2}'| sed s/\\///g )cvs VERSION=$(CVSID) @@ -97,9 +106,15 @@ all: $(LISPCBIN) $(CORE) $(RUNCGI) $(BINS) +module:$(APACHE_MOD) + +$(APACHE_MOD): mod_clhp.c + $(APXS) -c $< + .PHONY: all install uninstall clean clean-all clean-backups install-dirs \ install-source install-source-dirs uninstall-files uninstall-dirs \ - install-core tests clean-dist $(RECURSIVE_TARGETS) check + install-core tests clean-dist $(RECURSIVE_TARGETS) check \ + module-install %.x86f: %.lisp $(LISPC) $< @@ -124,6 +139,9 @@ sed 's:$CORE=$:\1$(COREDIR)/$(CORE):' | \ sed 's:$CMUCLLIB=$:\1$(LIBDIR):' > $@ +module-install: $(APACHE_MOD) + $(APXS) -i -a $< + install: all install-dirs install-core for f in $(BINS) ; do \ $(INSTALLFILE) $$f $(LIBDIR) ; \ @@ -179,7 +197,7 @@ $(TARBALL): $(DISTFILES) distdir=clhp-$(VERSION) ; \ if test ! -d $$distdir; then mkdir -v $$distdir ; fi ; \ - for dir in $(SUBDIRS); do \ + for dir in $(DIST_SUBDIRS); do \ if test ! -d $$distdir/$$dir; then \ mkdir -v $$distdir/$$dir ; \ fi ; \ @@ -195,8 +213,7 @@ clean-all: clean-all-recursive clean clean-backups clean-dist clean: clean-recursive - for f in $(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) \ - $(TESTS) $(TARBALL); \ + for f in $(CLEAN_TARGETS); \ do \ if test -f $$f ; then rm -v $$f ; fi \ done Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.19 clhp/ChangeLog:1.20 --- clhp/ChangeLog:1.19 Tue Oct 21 12:57:27 2003 +++ clhp/ChangeLog Thu Oct 30 21:27:12 2003 @@ -1,3 +1,13 @@ +2003-10-30 <ant(a)afghan.dogpound> + + * Makefile: Addedd rules for mod_clhp, but it will not yet be + included in the real distribution, also removed tests/ from dist + tarball. + +2003-10-29 <ant(a)afghan.dogpound> + + * mod_clhp.c (Handler): Beginning work on Apache module + 2003-10-21 <ant(a)afghan.dogpound> * cgi.lisp (*QUERY-VARS*): Fixed so test is #'equal, which will @@ -121,4 +131,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.19 2003/10/21 16:57:27 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.20 2003/10/31 02:27:12 aventimiglia Exp $ \ No newline at end of file

1 0

[clhp-cvs] CVS update: clhp/tests/clhp-xptests.lisp
by Anthony Ventimiglia 31 Oct '03

31 Oct '03

Update of /project/clhp/cvsroot/clhp/tests In directory common-lisp.net:/tmp/cvs-serv27271/tests Added Files: clhp-xptests.lisp Log Message: This is a test file using xptest, I'm not too sure I like xptest, but it's in here none the less Date: Thu Oct 30 21:26:55 2003 Author: aventimiglia

1 0

[clhp-cvs] CVS update: clhp/mod_clhp.c
by Anthony Ventimiglia 29 Oct '03

29 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv6634 Added Files: mod_clhp.c Log Message: Working on Apache Module Date: Wed Oct 29 16:34:44 2003 Author: aventimiglia

1 0