Changeset 909 for trunk

Timestamp:

08/30/08 11:28:36 (3 months ago)

Author:

Gregor

Message:

rebuild/mars.c: Don't use pthreads on Windows.

rebuild/*.exe: Updated.

Files:

• trunk/rebuild/mars.c (modified) (6 diffs)
• trunk/rebuild/rebuild.exe (modified) (previous)
• trunk/rebuild/rebuild_choosedc.exe (modified) (previous)

trunk/rebuild/mars.c

@@ -21 +21 @@
-#include <sys/types.h>
-
-
-
-
-
+
+
-#include <pthread.h>
+#endif
-
-#if _WIN32
@@ -126 +125 @@
-Array GroupedCompiles;
-unsigned int curcompile = 0;
+
+#ifndef _WIN32
-pthread_mutex_t compilemutex;
+#endif
+
-void *compileThread(void *);
-
@@ -1719 +1722 @@
-    
-    // Now do the actual compilation, across any number of processors
+#ifndef _WIN32
-    if (global.params.procs > 1) {
-        pthread_t threads[global.params.procs];
@@ -1729 +1733 @@
-            pthread_join(threads[j], NULL);
-        }
-
+
+
+
-        compileThread(NULL);
-    }
@@ -1788 +1794 @@
-void *compileThread(void *ignore)
-{
+#ifndef _WIN32
-    pthread_mutex_lock(&compilemutex);
+#endif
-    int tnum = rand();
-    while (curcompile < GroupedCompiles.dim) {
-        GroupedCompile *gc = (GroupedCompile *) GroupedCompiles.data[curcompile];
-        curcompile++;
+#ifndef _WIN32
-        pthread_mutex_unlock(&compilemutex);
+#endif
-
-        if (gc->imodules.dim == 0) {
+#ifndef _WIN32
-            pthread_mutex_lock(&compilemutex);
+#endif
-            continue;
-        }
@@ -1844 +1856 @@
-        }
-
+#ifndef _WIN32
-        pthread_mutex_lock(&compilemutex);
-
+
+
+
-    pthread_mutex_unlock(&compilemutex);
+#endif
-}
-