From 570e332f849b34db4fa44612b9d7c65572a38d25 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 24 Feb 2010 21:18:29 +1300 Subject: [PATCH 1/3] core-foundation.run-loop: cleanup --- basis/core-foundation/run-loop/run-loop.factor | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/basis/core-foundation/run-loop/run-loop.factor b/basis/core-foundation/run-loop/run-loop.factor index e2ba06d61f..56b5a9c798 100644 --- a/basis/core-foundation/run-loop/run-loop.factor +++ b/basis/core-foundation/run-loop/run-loop.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2008 Slava Pestov +! Copyright (C) 2008, 2010 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien alien.c-types alien.syntax kernel math namespaces sequences destructors combinators threads heaps @@ -92,7 +92,10 @@ TUPLE: run-loop fds sources timers ; ] bi ; : invalidate-run-loop-timers ( -- ) - run-loop [ [ [ CFRunLoopTimerInvalidate ] [ CFRelease ] bi ] each V{ } ] change-timers drop ; + run-loop [ + [ [ CFRunLoopTimerInvalidate ] [ CFRelease ] bi ] each + V{ } clone + ] change-timers drop ; Date: Wed, 24 Feb 2010 21:20:21 +1300 Subject: [PATCH 2/3] io.files.unix: fix load errors arising from byte-length being moved --- basis/io/files/info/unix/freebsd/freebsd.factor | 2 +- basis/io/files/info/unix/netbsd/netbsd.factor | 2 +- basis/io/files/info/unix/openbsd/openbsd.factor | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basis/io/files/info/unix/freebsd/freebsd.factor b/basis/io/files/info/unix/freebsd/freebsd.factor index f1d6b4db66..7c13d86a3c 100644 --- a/basis/io/files/info/unix/freebsd/freebsd.factor +++ b/basis/io/files/info/unix/freebsd/freebsd.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors alien.c-types alien.syntax combinators +USING: accessors alien alien.c-types alien.syntax combinators io.backend io.files io.files.info io.files.unix kernel math system unix unix.statfs.freebsd unix.statvfs.freebsd unix.getfsstat.freebsd sequences grouping alien.strings io.encodings.utf8 unix.types diff --git a/basis/io/files/info/unix/netbsd/netbsd.factor b/basis/io/files/info/unix/netbsd/netbsd.factor index 9e37ec8aa9..9ea475433b 100644 --- a/basis/io/files/info/unix/netbsd/netbsd.factor +++ b/basis/io/files/info/unix/netbsd/netbsd.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax kernel unix.stat math unix +USING: alien alien.syntax kernel unix.stat math unix combinators system io.backend accessors alien.c-types io.encodings.utf8 alien.strings unix.types io.files.unix io.files io.files.info unix.statvfs.netbsd unix.getfsstat.netbsd arrays diff --git a/basis/io/files/info/unix/openbsd/openbsd.factor b/basis/io/files/info/unix/openbsd/openbsd.factor index be88929f2e..e80a4fdafd 100644 --- a/basis/io/files/info/unix/openbsd/openbsd.factor +++ b/basis/io/files/info/unix/openbsd/openbsd.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors alien.c-types alien.strings alien.syntax +USING: accessors alien alien.c-types alien.strings alien.syntax combinators io.backend io.files io.files.info io.files.unix kernel math sequences system unix unix.getfsstat.openbsd grouping unix.statfs.openbsd unix.statvfs.openbsd unix.types From dad3870abd4d994fb490f5cb6f24c28a372a9abc Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 24 Feb 2010 02:47:45 -0600 Subject: [PATCH 3/3] Use for(;;) instead of do/while in a few places, fix safe_fread's error handling --- vm/io.cpp | 66 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/vm/io.cpp b/vm/io.cpp index 0682a1d124..fdd872457e 100755 --- a/vm/io.cpp +++ b/vm/io.cpp @@ -34,20 +34,22 @@ void factor_vm::io_error() FILE *factor_vm::safe_fopen(char *filename, char *mode) { FILE *file; - do { + for(;;) + { file = fopen(filename,mode); if(file == NULL) io_error(); else break; - } while(errno == EINTR); + } return file; } int factor_vm::safe_fgetc(FILE *stream) { int c; - do { + for(;;) + { c = fgetc(stream); if(c == EOF) { @@ -58,38 +60,53 @@ int factor_vm::safe_fgetc(FILE *stream) } else break; - } while(errno == EINTR); + } return c; } size_t factor_vm::safe_fread(void *ptr, size_t size, size_t nitems, FILE *stream) { size_t items_read = 0; + size_t ret = 0; - do { - items_read += fread((void*)((int*)ptr+items_read*size),size,nitems-items_read,stream); - } while(items_read != nitems && errno == EINTR); + do + { + ret = fread((void*)((int*)ptr+items_read*size),size,nitems-items_read,stream); + if(ret == 0) + { + if(feof(stream)) + break; + else + io_error(); + } + items_read += ret; + } while(items_read != nitems); return items_read; } void factor_vm::safe_fputc(int c, FILE *stream) { - do { + for(;;) + { if(fputc(c,stream) == EOF) io_error(); else break; - } while(errno == EINTR); + } } size_t factor_vm::safe_fwrite(void *ptr, size_t size, size_t nitems, FILE *stream) { size_t items_written = 0; + size_t ret = 0; do { - items_written += fwrite((void*)((int*)ptr+items_written*size),size,nitems-items_written,stream); - } while(items_written != nitems && errno == EINTR); + ret = fwrite((void*)((int*)ptr+items_written*size),size,nitems-items_written,stream); + if(ret == 0) + io_error(); + items_written += ret; + } while(items_written != nitems); return items_written; } @@ -97,12 +114,13 @@ size_t factor_vm::safe_fwrite(void *ptr, size_t size, size_t nitems, FILE *strea int factor_vm::safe_ftell(FILE *stream) { off_t offset; - do { + for(;;) + { if((offset = FTELL(stream)) == -1) io_error(); else break; - } while(errno == EINTR); + } return offset; } @@ -117,32 +135,35 @@ void factor_vm::safe_fseek(FILE *stream, off_t offset, int whence) critical_error("Bad value for whence",whence); } - do { + for(;;) + { if(FSEEK(stream,offset,whence) == -1) io_error(); else break; - } while(errno == EINTR); + } } void factor_vm::safe_fflush(FILE *stream) { - do { + for(;;) + { if(fflush(stream) == EOF) io_error(); else break; - } while(errno == EINTR); + } } void factor_vm::safe_fclose(FILE *stream) { - do { + for(;;) + { if(fclose(stream) == EOF) io_error(); else break; - } while(errno == EINTR); + } } void factor_vm::primitive_fopen() @@ -189,12 +210,7 @@ void factor_vm::primitive_fread() int c = safe_fread(buf.untagged() + 1,1,size,file); if(c == 0) - { - if(feof(file)) - ctx->push(false_object); - else - io_error(); - } + ctx->push(false_object); else { if(feof(file))