OK, this is the start of getting things running on BeOS again :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88135 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/beos/mpm.h b/server/mpm/beos/mpm.h
index e6980b21c863ae75413bd1349f0912bf2ff29079..4ea10e4acf81869a86b4bd60acc3eed76251a1a2 100644 (file)
--- a/server/mpm/beos/mpm.h
+++ b/server/mpm/beos/mpm.h
@@ -63,23 +63,14 @@
 
 #define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1
 #define MPM_SYNC_CHILD_TABLE()
-#define MPM_CHILD_PID(i) (ap_child_table[i].pid)
+#define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
 #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
 
 extern int ap_max_child_assigned;
 #include "scoreboard.h"
 
-#define SERVER_DEAD 0
-#define SERVER_DYING 1
-#define SERVER_ALIVE 2
-
-typedef struct ap_ctable{
-    pid_t pid;
-    unsigned char status;
-} ap_ctable;
-
-extern ap_ctable ap_child_table[HARD_SERVER_LIMIT];
 extern server_rec *ap_server_conf;
 extern char ap_coredump_dir[MAX_STRING_LEN];
+extern int ap_threads_per_child;
 
 #endif /* APACHE_MPM_BEOS_H */

diff --git a/server/mpm/beos/mpm_default.h b/server/mpm/beos/mpm_default.h
index ffe055d40d8492954e4bdd139574aec84e378b59..02e7f434794c31159872a7af74331379421e3cc9 100644 (file)
--- a/server/mpm/beos/mpm_default.h
+++ b/server/mpm/beos/mpm_default.h
@@ -59,6 +59,10 @@
 #ifndef APACHE_MPM_DEFAULT_H
 #define APACHE_MPM_DEFAULT_H
 
+
+#define AP_ID_FROM_CHILD_THREAD(c, t)    ((c * HARD_THREAD_LIMIT) + t)
+#define AP_CHILD_THREAD_FROM_ID(i)       (0),(i)
+
 /* Number of servers to spawn off by default --- also, if fewer than
  * this free when the caretaker checks, it will spawn more.
  */
@@ -117,6 +121,7 @@
 #ifdef NO_THREADS
 #define DEFAULT_THREADS_PER_CHILD 1
 #endif
+
 #ifndef DEFAULT_THREADS_PER_CHILD
 #define DEFAULT_THREADS_PER_CHILD 10
 #endif
@@ -126,6 +131,11 @@
 #define DEFAULT_PIDLOG "logs/httpd.pid"
 #endif
 
+/* Scoreboard file, if there is one */
+#ifndef DEFAULT_SCOREBOARD
+#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
+#endif
+
 /*
  * Interval, in microseconds, between scoreboard maintenance.
  */