manoj 99/04/26 15:46:54
Modified: pthreads/src/modules/standard mod_status.c
Log:
pthread_t is not necessarily an integer, yet it was treated as one in
mod_status. For now, just use the index of the thread in the scoreboard
instead.
Revision Changes Path
1.11 +4 -6 apache-apr/pthreads/src/modules/standard/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /home/cvs/apache-apr/pthreads/src/modules/standard/mod_status.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- mod_status.c 1999/04/26 22:36:35 1.10
+++ mod_status.c 1999/04/26 22:46:53 1.11
@@ -253,7 +253,6 @@
parent_score ps_record;
char stat_buffer[HARD_SERVER_LIMIT][HARD_THREAD_LIMIT];
int pid_buffer[HARD_SERVER_LIMIT];
- int tid_buffer[HARD_SERVER_LIMIT][HARD_THREAD_LIMIT];
clock_t tu, ts, tcu, tcs;
server_rec *vhost;
@@ -314,7 +313,6 @@
res = score_record.status;
stat_buffer[i][j] = status_flags[res];
pid_buffer[i] = (int) ps_record.pid;
- tid_buffer[i][j] = (int) score_record.tid;
if (res == SERVER_READY)
ready++;
else if (res != SERVER_DEAD && res != SERVER_ACCEPTING
@@ -470,8 +468,8 @@
for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
for (j = 0; j < HARD_THREAD_LIMIT; ++j) {
if (stat_buffer[i][j] != '.') {
- ap_rprintf(r, " %d,%d in state: %c ", pid_buffer[i],
- tid_buffer[i][j], stat_buffer[i][j]);
+ ap_rprintf(r, " %d,%d in state: %c ", pid_buffer[i], j,
+ stat_buffer[i][j]);
if (++k >= 3) {
ap_rputs("\n", r);
k = 0;
@@ -550,7 +548,7 @@
"<b>Server %d-%d</b> (pid: %d, tid: %d):
%d|%lu|%lu [",
i, (int) ps_record.generation,
(int) ps_record.pid,
- (int) score_record.tid,
+ (int) j,
(int) conn_lres, my_lres, lres);
switch (score_record.status) {
@@ -623,7 +621,7 @@
ap_rprintf(r,
"<tr><td><b>%d-%d</b><td>%d<td>%d<td>%d/%lu/%lu",
i, (int) ps_record.generation,
- (int) ps_record.pid, (int) score_record.tid,
(int) conn_lres,
+ (int) ps_record.pid, (int) j, (int) conn_lres,
my_lres, lres);
switch (score_record.status) {
