Clearing of thread flags added

diff --git a/main.c b/main.c
index 631d84e9556bf75e3635712a71463f3dad0b0c22..fed957978c7c9c4e54dcbc934753a28e4035faca 100644 (file)
--- a/main.c
+++ b/main.c
@@ -424,7 +424,6 @@ int main(int argc, char **argv)
        java_objectheader *exceptionptr;
        void *dummy;
        
-
    /********** interne (nur fuer main relevante Optionen) **************/
    
        char logfilename[200] = "";
@@ -443,6 +442,8 @@ int main(int argc, char **argv)
 #endif
 
 
+       atexit(clear_thread_flags);
+
    /************ Infos aus der Environment lesen ************************/
 
        cp = getenv ("CLASSPATH");

diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c
index 631d84e9556bf75e3635712a71463f3dad0b0c22..fed957978c7c9c4e54dcbc934753a28e4035faca 100644 (file)
--- a/src/cacao/cacao.c
+++ b/src/cacao/cacao.c
@@ -424,7 +424,6 @@ int main(int argc, char **argv)
        java_objectheader *exceptionptr;
        void *dummy;
        
-
    /********** interne (nur fuer main relevante Optionen) **************/
    
        char logfilename[200] = "";
@@ -443,6 +442,8 @@ int main(int argc, char **argv)
 #endif
 
 
+       atexit(clear_thread_flags);
+
    /************ Infos aus der Environment lesen ************************/
 
        cp = getenv ("CLASSPATH");

diff --git a/src/threads/green/threadio.c b/src/threads/green/threadio.c
index e538b409ac23d64bd36baa3ca0f89529989f756b..379b49af11d16acc7a3afa01037741209b3d6441 100644 (file)
--- a/src/threads/green/threadio.c
+++ b/src/threads/green/threadio.c
@@ -107,6 +107,39 @@ threadedFileDescriptor(int fd)
     return (fd);
 }
 
+void clear_thread_flags(void)
+{
+#if !defined(BLOCKING_CALLS)
+       int fl, fd;
+
+#if defined(HAVE_FCNTL) && defined(O_NONBLOCK)
+       fd = fileno(stdin);
+    fl = fcntl(fd, F_GETFL, 0);
+    fl = fcntl(fd, F_SETFL, fl & (~O_NONBLOCK));
+
+       fd = fileno(stdout);
+    fl = fcntl(fd, F_GETFL, 0);
+    fl = fcntl(fd, F_SETFL, fl & (~O_NONBLOCK));
+
+       fd = fileno(stderr);
+    fl = fcntl(fd, F_GETFL, 0);
+    fl = fcntl(fd, F_SETFL, fl & (~O_NONBLOCK));
+#elif defined(HAVE_IOCTL) && defined(FIONBIO)
+       fl = 0;
+       fd = fileno(stdin);
+    (void) ioctl(fd, FIONBIO, &fl);
+
+       fd = fileno(stdout);
+    (void) ioctl(fd, FIONBIO, &fl);
+
+       fd = fileno(stderr);
+    (void) ioctl(fd, FIONBIO, &fl);
+#endif
+
+#endif
+}
+
+
 /*
  * Threaded create socket.
  */

diff --git a/src/threads/green/threads.h b/src/threads/green/threads.h
index f71cd06c1ef6256e3d4041920eb051c09a2db2ca..1d37f613deec23825d350fbd97de7fe1a7145172 100644 (file)
--- a/src/threads/green/threads.h
+++ b/src/threads/green/threads.h
@@ -94,6 +94,7 @@ typedef struct _thread
 } thread;
 
 void initThreads(u1 *stackbottom);
+void clear_thread_flags(void);
 void startThread(thread*);
 void resumeThread(thread*);
 void iresumeThread(thread*);

diff --git a/threads/thread.h b/threads/thread.h
index f71cd06c1ef6256e3d4041920eb051c09a2db2ca..1d37f613deec23825d350fbd97de7fe1a7145172 100644 (file)
--- a/threads/thread.h
+++ b/threads/thread.h
@@ -94,6 +94,7 @@ typedef struct _thread
 } thread;
 
 void initThreads(u1 *stackbottom);
+void clear_thread_flags(void);
 void startThread(thread*);
 void resumeThread(thread*);
 void iresumeThread(thread*);

diff --git a/threads/threadio.c b/threads/threadio.c
index e538b409ac23d64bd36baa3ca0f89529989f756b..379b49af11d16acc7a3afa01037741209b3d6441 100644 (file)
--- a/threads/threadio.c
+++ b/threads/threadio.c
@@ -107,6 +107,39 @@ threadedFileDescriptor(int fd)
     return (fd);
 }
 
+void clear_thread_flags(void)
+{
+#if !defined(BLOCKING_CALLS)
+       int fl, fd;
+
+#if defined(HAVE_FCNTL) && defined(O_NONBLOCK)
+       fd = fileno(stdin);
+    fl = fcntl(fd, F_GETFL, 0);
+    fl = fcntl(fd, F_SETFL, fl & (~O_NONBLOCK));
+
+       fd = fileno(stdout);
+    fl = fcntl(fd, F_GETFL, 0);
+    fl = fcntl(fd, F_SETFL, fl & (~O_NONBLOCK));
+
+       fd = fileno(stderr);
+    fl = fcntl(fd, F_GETFL, 0);
+    fl = fcntl(fd, F_SETFL, fl & (~O_NONBLOCK));
+#elif defined(HAVE_IOCTL) && defined(FIONBIO)
+       fl = 0;
+       fd = fileno(stdin);
+    (void) ioctl(fd, FIONBIO, &fl);
+
+       fd = fileno(stdout);
+    (void) ioctl(fd, FIONBIO, &fl);
+
+       fd = fileno(stderr);
+    (void) ioctl(fd, FIONBIO, &fl);
+#endif
+
+#endif
+}
+
+
 /*
  * Threaded create socket.
  */