[svn:modperl-modules] rev 147 - in Apache-Scoreboard-2.0/trunk: . apxs

Author: stas
Date: Sat Feb 26 07:34:45 2005
New Revision: 147

Modified:
   Apache-Scoreboard-2.0/trunk/MANIFEST
   Apache-Scoreboard-2.0/trunk/Scoreboard.xs
   Apache-Scoreboard-2.0/trunk/apxs/send.c
Log:
polish

Modified: Apache-Scoreboard-2.0/trunk/MANIFEST
==============================================================================
--- Apache-Scoreboard-2.0/trunk/MANIFEST	(original)
+++ Apache-Scoreboard-2.0/trunk/MANIFEST	Sat Feb 26 07:34:45 2005
@@ -21,8 +21,6 @@
 t/conf/extra.conf.in
 t/conf/modperl_extra.pl
 t/external/basic.t
-t/htdocs
-t/htdocs/scoreboard
 t/internal/basic.t
 t/lib/MyTest/Common.pm
 t/response/TestInternal/basic.pm

Modified: Apache-Scoreboard-2.0/trunk/Scoreboard.xs
==============================================================================
--- Apache-Scoreboard-2.0/trunk/Scoreboard.xs	(original)
+++ Apache-Scoreboard-2.0/trunk/Scoreboard.xs	Sat Feb 26 07:34:45 2005
@@ -132,6 +132,7 @@
 
 }
 
+MP_INLINE
 static worker_score *my_get_scoreboard_worker(pTHX_
                                               modperl_scoreboard_t *image,
                                               int x, int y)
@@ -143,9 +144,10 @@
     return &image->sb->servers[x][y];
 }
 
+MP_INLINE
 static process_score *my_get_scoreboard_process(pTHX_
-                                                modperl_scoreboard_t *image,
-                                                int x)
+                                         modperl_scoreboard_t *image,
+                                         int x)
 {
     if ((x < 0) || (image->server_limit < x)) {
         Perl_croak(aTHX_ "parent score [%d] is out of limit", x);
@@ -375,23 +377,15 @@
     int worker_idx
 
     PREINIT:
-    //worker_score *ws;
+    worker_score *ws;
     
     CODE:
-    //ws = my_get_scoreboard_worker(aTHX_ image, parent_idx, worker_idx);
-    //RETVAL = (modperl_worker_score_t *)apr_pcalloc(image->pool,
-    //                                               (sizeof(*RETVAL)));
-    //RETVAL->record = ws;
-    if (((parent_idx < 0) || (image->server_limit < parent_idx)) ||
-        ((worker_idx < 0) || (image->thread_limit < worker_idx))) {
-        Perl_croak(aTHX_ "worker score [%d][%d] is out of limit",
-                   parent_idx, worker_idx);
-    }
+    ws = my_get_scoreboard_worker(aTHX_ image, parent_idx, worker_idx);
     RETVAL = (modperl_worker_score_t *)apr_pcalloc(image->pool,
                                                    (sizeof(*RETVAL)));
-    RETVAL->record = &(image->sb->servers[parent_idx][worker_idx]);
     RETVAL->parent_idx = parent_idx;
     RETVAL->worker_idx = worker_idx;
+    RETVAL->record = ws;
     
     OUTPUT:
     RETVAL
@@ -526,17 +520,10 @@
     CODE:
     RETVAL = (modperl_worker_score_t *)apr_pcalloc(self->image->pool,
                                                    sizeof(*RETVAL));
-//RETVAL->record     = my_get_scoreboard_worker(aTHX_ self->image,
-//                                                 self->idx, 0);
-
-    if (((self->idx < 0) || (self->image->server_limit < self->idx))) {
-        Perl_croak(aTHX_ "worker score [%d][%d] is out of limit",
-                   self->idx, 0);
-    }
-    RETVAL->record = &(self->image->sb->servers[self->idx][0]);
-
     RETVAL->parent_idx = self->idx;
     RETVAL->worker_idx = 0;
+    RETVAL->record     = my_get_scoreboard_worker(aTHX_ self->image,
+                                                  self->idx, 0);
 
     OUTPUT:
     RETVAL
@@ -554,10 +541,10 @@
     if (next_idx < self->image->thread_limit) {
         RETVAL = (modperl_worker_score_t *)apr_pcalloc(self->image->pool,
                                                        sizeof(*RETVAL));
-        RETVAL->record = my_get_scoreboard_worker(aTHX_ self->image,
-                                                  mws->parent_idx, next_idx);
         RETVAL->parent_idx = mws->parent_idx;
         RETVAL->worker_idx = next_idx;
+        RETVAL->record     = my_get_scoreboard_worker(aTHX_ self->image,
+                                                      mws->parent_idx, next_idx);
     }
     else {
 	XSRETURN_UNDEF;

Modified: Apache-Scoreboard-2.0/trunk/apxs/send.c
==============================================================================
--- Apache-Scoreboard-2.0/trunk/apxs/send.c	(original)
+++ Apache-Scoreboard-2.0/trunk/apxs/send.c	Sat Feb 26 07:34:45 2005
@@ -58,24 +58,23 @@
     pack16(ptr, server_limit);
     ptr += SIZE16;
     pack16(ptr, thread_limit);
+
+#if 0
     ap_log_error(APLOG_MARK, APLOG_ERR, 0, modperl_global_get_server_rec(),
                  "send: sizes server_num=%d, thread_num=%d, psize=%d, "
                  "ssize=%d, %d, %d, %d\n",
                  server_num, thread_limit, psize, ssize,
                  sizeof(global_score), sizeof(buf), tsize);
- 
+#endif
+    
     ap_set_content_length(r, tsize);
     r->content_type = REMOTE_SCOREBOARD_TYPE;
     
     if (!r->header_only) {
-	WRITE_BUFF(&buf[0],                          sizeof(buf),          r);
-	WRITE_BUFF(&ap_scoreboard_image->parent[0],  psize,                r);
-        //int i;
-    //for (i = 0; i < server_limit; i++) {
-    //    WRITE_BUFF(ap_scoreboard_image->servers[i], sizeof(worker_score), r);
-    //}
-    WRITE_BUFF(ap_scoreboard_image->servers[0], ssize,                r);
-	WRITE_BUFF(&ap_scoreboard_image->global,     sizeof(global_score), r);
+	WRITE_BUFF(&buf[0],                         sizeof(buf),          r);
+	WRITE_BUFF(&ap_scoreboard_image->parent[0], psize,                r);
+        WRITE_BUFF(ap_scoreboard_image->servers[0], ssize,                r);
+	WRITE_BUFF(&ap_scoreboard_image->global,    sizeof(global_score), r);
     }
 
     return APR_SUCCESS;