From: <cli...@li...> - 2006-01-24 04:19:06
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/src spvw_memfile.d,1.106,1.107 ChangeLog,1.5244,1.5245 (Sam Steingold) 2. clisp/modules/syscalls test.tst,1.33,1.34 (Sam Steingold) 3. clisp/src makemake.in,1.641,1.642 (Sam Steingold) 4. clisp/src makemake.in,1.642,1.643 ChangeLog,1.5245,1.5246 (Sam Steingold) --__--__-- Message: 1 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src spvw_memfile.d,1.106,1.107 ChangeLog,1.5244,1.5245 Date: Mon, 23 Jan 2006 16:01:01 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25868/src Modified Files: spvw_memfile.d ChangeLog Log Message: (find_memdump): when 'image size' fails, reset mem_start to -1 Index: spvw_memfile.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/spvw_memfile.d,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- spvw_memfile.d 22 Jan 2006 21:25:48 -0000 1.106 +++ spvw_memfile.d 23 Jan 2006 16:00:56 -0000 1.107 @@ -234,7 +234,7 @@ local void find_memdump (Handle fd); /* the size of the runtime executable for executable dumping == the start of memory image in the executable */ -static size_t mem_start = 0; +static size_t mem_start = (size_t)-1; static bool mem_searched = false; /* have we looked for memdump already */ static void savemem_with_runtime (Handle handle) { var char *executable_name = get_executable_name(); @@ -1751,16 +1751,18 @@ full_read(fd,(void*)&header1,header_size); if (memcmp((void*)&header,(void*)&header1,header_size) != 0) mem_start = (size_t)-1; /* bad header => no image */ - } - #if defined(LOADMEM_TRY_SEARCH) - else { /* lseek+read does not work ==> use marker */ + } else { + #if defined(LOADMEM_TRY_SEARCH) + /* lseek+read does not work ==> use marker */ lseek(fd,0,SEEK_SET); mem_start = find_marker(fd,(char*)&header,header_size); if (mem_start != (size_t)-1) /* image size failed, but header is found -- this is fishy! */ fprintf(stderr,GETTEXTL("%s: 'image size' method failed, but found image header at %d\n"),get_executable_name(),mem_start); + #else + mem_start = (size_t)-1; + #endif } - #endif mem_searched = true; } Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.5244 retrieving revision 1.5245 diff -u -d -r1.5244 -r1.5245 --- ChangeLog 23 Jan 2006 03:30:38 -0000 1.5244 +++ ChangeLog 23 Jan 2006 16:00:56 -0000 1.5245 @@ -1,3 +1,8 @@ +2006-01-23 Sam Steingold <sd...@gn...> + + * spvw_memfile.d (find_memdump): when 'image size' fails, + reset mem_start to -1 + 2006-01-22 Sam Steingold <sd...@gn...> * modules/berkeley-db/bdb.c, modules/berkeley-db/configure.in: --__--__-- Message: 2 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/syscalls test.tst,1.33,1.34 Date: Mon, 23 Jan 2006 18:32:27 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/syscalls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30246/modules/syscalls Modified Files: test.tst Log Message: stream-lock may fail with ENOLCK - in which case we do not test locking Index: test.tst =================================================================== RCS file: /cvsroot/clisp/clisp/modules/syscalls/test.tst,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- test.tst 16 Dec 2005 14:44:39 -0000 1.33 +++ test.tst 23 Jan 2006 18:32:24 -0000 1.34 @@ -44,7 +44,13 @@ #+unix (os:stream-options *tmp1* :fd nil) NIL #+unix (os:stream-options *tmp1* :fd) NIL -(os:stream-lock *tmp1* t) T +;; this may fail with ENOLCK - in which case we do not test locking +(handler-case (os:stream-lock *tmp1* t) + (error (err) + (format t "~S: ~A" 'os:stream-lock err) + (pushnew :no-stream-lock *features*) + T)) +T (os:stream-lock *tmp1* nil) NIL (typep (show (os:priority (os:process-id))) '(or keyword (integer -20 20))) T @@ -173,7 +179,9 @@ (let* ((argv (ext:argv)) (run (aref argv 0)) (args (list "-M" (aref argv (1+ (position "-M" argv :test #'string=))) - "-norc" "-q"))) + "-B" (aref argv (1+ (position "-B" argv :test #'string=))) + "-norc" "-q" "-on-error" "abort"))) + (show (cons run args)) (defparameter *proc1* (ext:run-program run :arguments args :input :stream :output :stream)) (defparameter *proc2* (ext:run-program run :arguments args @@ -192,16 +200,24 @@ (truename *tmp1*))) T -(read-from-string (proc-send *proc1* "(stream-lock s t)")) T -(proc-send *proc2* "(stream-lock s t)") NIL ; blocked +#-:no-stream-lock (read-from-string (proc-send *proc1* "(stream-lock s t)")) +#-:no-stream-lock T +#-:no-stream-lock (proc-send *proc2* "(stream-lock s t)") +#-:no-stream-lock NIL ; blocked -(read-from-string (proc-send *proc1* "(stream-lock s nil)")) NIL ; released -(read-from-string (flush-clisp *proc2*)) T ; acquired +#-:no-stream-lock (read-from-string (proc-send *proc1* "(stream-lock s nil)")) +#-:no-stream-lock NIL ; released +#-:no-stream-lock (read-from-string (flush-clisp *proc2*)) +#-:no-stream-lock T ; acquired -(read-from-string (proc-send *proc1* "(stream-lock s t :block nil)")) NIL -(read-from-string (proc-send *proc2* "(stream-lock s nil)")) NIL ; released -(read-from-string (proc-send *proc1* "(stream-lock s t :block nil)")) T -(read-from-string (proc-send *proc1* "(stream-lock s nil)")) NIL ; released +#-:no-stream-lock (read-from-string (proc-send *proc1* "(stream-lock s t :block nil)")) +#-:no-stream-lock NIL +#-:no-stream-lock (read-from-string (proc-send *proc2* "(stream-lock s nil)")) +#-:no-stream-lock NIL ; released +#-:no-stream-lock (read-from-string (proc-send *proc1* "(stream-lock s t :block nil)")) +#-:no-stream-lock T +#-:no-stream-lock (read-from-string (proc-send *proc1* "(stream-lock s nil)")) +#-:no-stream-lock NIL ; released ;; check :rename-and-delete ;; woe32 signals ERROR_SHARING_VIOLATION @@ -238,5 +254,6 @@ (delete-file *tmp2*) (makunbound '*tmp2*) (unintern '*tmp2*) (fmakunbound 'flush-clisp) (unintern 'flush-clisp) (fmakunbound 'proc-send) (unintern 'proc-send) + (setq *features* (delete :no-stream-lock *features*)) T) T --__--__-- Message: 3 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src makemake.in,1.641,1.642 Date: Mon, 23 Jan 2006 20:54:20 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21111/src Modified Files: makemake.in Log Message: comment Index: makemake.in =================================================================== RCS file: /cvsroot/clisp/clisp/src/makemake.in,v retrieving revision 1.641 retrieving revision 1.642 diff -u -d -r1.641 -r1.642 --- makemake.in 20 Jan 2006 17:15:02 -0000 1.641 +++ makemake.in 23 Jan 2006 20:54:17 -0000 1.642 @@ -2278,6 +2278,9 @@ echol fi +# in the toplevel Makefile.devel, makemake depends olso on version.sh. +# we do not need that here because makemake depends on config.status - +# depends on src/configure - depends on version.sh in Makefile.devel echol "makemake : makemake.in config.status" echotab "sh config.status --file=makemake" echol --__--__-- Message: 4 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src makemake.in,1.642,1.643 ChangeLog,1.5245,1.5246 Date: Mon, 23 Jan 2006 21:10:36 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28158/src Modified Files: makemake.in ChangeLog Log Message: (clean0): also remove *.core and *.stackdump Index: makemake.in =================================================================== RCS file: /cvsroot/clisp/clisp/src/makemake.in,v retrieving revision 1.642 retrieving revision 1.643 diff -u -d -r1.642 -r1.643 --- makemake.in 23 Jan 2006 20:54:17 -0000 1.642 +++ makemake.in 23 Jan 2006 21:10:32 -0000 1.643 @@ -3951,7 +3951,7 @@ cat <<!! # clean0 is harmless: removes only superfluous things: temporary files. clean0 : force - -\$(RM) core${OBSOLETE} + -\$(RM) core *.core *.stackdump${OBSOLETE} -\$(RMRF) linkkit # clean1 removes everything that becomes obsolete once lisp${LEXE} is recompiled Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.5245 retrieving revision 1.5246 diff -u -d -r1.5245 -r1.5246 --- ChangeLog 23 Jan 2006 16:00:56 -0000 1.5245 +++ ChangeLog 23 Jan 2006 21:10:33 -0000 1.5246 @@ -1,5 +1,9 @@ 2006-01-23 Sam Steingold <sd...@gn...> + * makemake.in (clean0): also remove *.core and *.stackdump + +2006-01-23 Sam Steingold <sd...@gn...> + * spvw_memfile.d (find_memdump): when 'image size' fails, reset mem_start to -1 --__--__-- _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest |