Changeset 101 in Main for trunk

Timestamp:

Sep 19, 2024, 11:45:27 PM (2 months ago)

Author:

Nishi

Message:

fix select

File:

• trunk/Server/server.c (modified) (4 diffs)

trunk/Server/server.c

@@ -750 +750 @@
 #endif
 
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(__HAIKU__)
 struct thread_entry {
+#ifdef __HAIKU__
+        thread_id thread;
+#else
         HANDLE handle;
+#endif
         bool used;
 };
@@ -760 +764 @@
         struct timeval tv;
         int i;
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(__HAIKU__)
         struct thread_entry threads[2048];
         for(i = 0; i < sizeof(threads) / sizeof(threads[0]); i++) {
@@ -784 +788 @@
                         break;
                 } else if(ret == 0) {
-#ifdef __MINGW32__
-                        for(i = 0; i < sizeof(threads) / sizeof(threads[0]); i++) {
-                                if(threads[i].used) {
-                                        DWORD ex;
-                                        GetExitCodeThread(threads[i].handle, &ex);
-                                        if(ex != STILL_ACTIVE) {
-                                                CloseHandle(threads[i].handle);
-                                                threads[i].used = false;
-                                        }
-                                }
-                        }
-#endif
 #ifdef SERVICE
                         if(status.dwCurrentState == SERVICE_STOP_PENDING) {
@@ -837 +829 @@
                                         }
 #elif defined(__HAIKU__)
-                                        thread_id thr = spawn_thread(tw_server_pass, "Tewi HTTPd", 60, e);
-                                        resume_thread(thr);
+                                        for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
+                                                if(threads[j].used) {
+                                                        thread_info info;
+                                                        bool kill = false;
+                                                        if(get_thread_info(threads[j].thread, &info) == B_OK){
+                                                        }else{
+                                                                kill = true;
+                                                        }
+                                                        if(kill){
+                                                                printf("Kill thread %d\n", threads[j].thread);
+                                                                threads[j].used = false;
+                                                        }
+                                                }
+                                        }
+                                        for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
+                                                if(!threads[j].used) {
+                                                        threads[j].thread = spawn_thread(tw_server_pass, "Tewi HTTPd", 60, e);
+                                                        threads[j].used = true;
+                                                        resume_thread(threads[j].thread);
+                                                        break;
+                                                }
+                                        }
 #else
                                         pid_t pid = fork();