PeruserAttachments: peruser_0.4b1_config_server-statusV1.path

Index: server/mpm/experimental/peruser/peruser.c
===================================================================
--- server/mpm/experimental/peruser/peruser.c   (revision 60)
+++ server/mpm/experimental/peruser/peruser.c   (working copy)
@@ -2629,6 +2629,7 @@
        }
 
        perform_idle_server_maintenance(pconf);
+       
 #ifdef TPF
         shutdown_pending = os_check_server(tpf_server_name);
         ap_check_signals();
@@ -3204,45 +3205,57 @@
 
     if (flags & AP_STATUS_SHORT)
            return OK;
-    
+
+
+       if (flags & AP_STATUS_STATS) {
+               ap_rputs("<h3>Processors statistics:</h3><table border=\"0\"><tr><th>Processor</th><th>Pss</th><th>503's</th><th>Avail</th></tr>", r);
+
+               /* just a mockup to se what data will be usefull here will put code layter, yes I know we need to iterate ON ENV[] NUM_ENV times */
+               for (x = 1; x < NUM_CHILDS; x++)
+               {
+                       senv = CHILD_INFO_TABLE[x].senv;
+                       ap_rprintf(r, "<tr><td nowrap>%s</td><td nowrap>%d/%d/%d</td>"
+                                       "<td>%d</td><td>%d%%</td></tr>",
+                                       senv == NULL ? NULL : ( senv->name == NULL ? "" : senv->name ),
+                                       idle_processors(x), total_processors(x), senv == NULL ? 0 : CHILD_INFO_TABLE[x].senv->max_processors,
+                                       0, senv == NULL ? 0 : CHILD_INFO_TABLE[x].senv->availability );
+                       }
+                       ap_rputs("</table><tr/>", r);
+       }else {
     ap_rputs("<hr>\n", r);
-    ap_rputs("<h2>peruser status</h2>\n", r);
+    ap_rputs("<h3>peruser status</h3>\n", r);
     ap_rputs("<table border=\"0\">\n", r);
-    ap_rputs("<tr><td>ID</td><td>PID</td><td>STATUS</td><td>SB STATUS</td><td>TYPE</td><td>UID</td>"
-                   "<td>GID</td><td>CHROOT</td><td>NICE</td><td>INPUT</td>"
-                   "<td>OUTPUT</td><td>SOCK_FD</td>"
-                   "<td>TOTAL PROCESSORS</td><td>MAX PROCESSORS</td>"
-                   "<td>IDLE PROCESSORS</td><td>MIN FREE PROCESSORS</td>"
-                   "<td>AVAIL</td>"
+    ap_rputs("<tr><th>ID</th><th>PID</th><th>STATUS</th><th>SB STATUS</th><th>Type</th><th>Processor</th>"
+                   "<th>Pss</th>"
+                   "<th>AVAIL</th>"
                    "</tr>\n", r);
     for (x = 0; x < NUM_CHILDS; x++)
         {
         senv = CHILD_INFO_TABLE[x].senv;
-        ap_rprintf(r, "<tr><td>%3d</td><td>%5d</td><td>%8s</td><td>%8s</td><td>%12s</td>"
-                       "<td>%4d</td><td>%4d</td><td>%25s</td><td>%3d</td><td>%5d</td>"
-                       "<td>%6d</td><td>%7d</td><td>%d</td><td>%d</td>"
-                       "<td>%d</td><td>%d</td><td>%3d</td></tr>\n",
+        ap_rprintf(r, "<tr><td>%3d</td><td>%5d</td><td>%8s</td><td>%8s</td><td>%12s</td><td nowrap>%48s</td>"
+                       "<td>%d/%d/%d</td>"
+                       "<td>%3d%%</td></tr>\n",
                        CHILD_INFO_TABLE[x].id, 
                        CHILD_INFO_TABLE[x].pid, 
                        child_status_string(CHILD_INFO_TABLE[x].status), 
                        scoreboard_status_string(SCOREBOARD_STATUS(x)),
                        child_type_string(CHILD_INFO_TABLE[x].type), 
-                       senv == NULL ? -1 : senv->uid, 
-                       senv == NULL ? -1 : senv->gid, 
-                       senv == NULL ? NULL : senv->chroot, 
-                       senv == NULL ? 0 : senv->nice_lvl,
-                       senv == NULL ? -1 : CHILD_INFO_TABLE[x].senv->input, 
-                       senv == NULL ? -1 : CHILD_INFO_TABLE[x].senv->output, 
-                       CHILD_INFO_TABLE[x].sock_fd,
+                       senv == NULL ? NULL : ( senv->name == NULL ? "" : senv->name ), 
+                                          idle_processors(x),
                        total_processors(x), 
-                       senv == NULL ? -1 : CHILD_INFO_TABLE[x].senv->max_processors,
-                       idle_processors(x),
-                       senv == NULL ? -1 : CHILD_INFO_TABLE[x].senv->min_free_processors,
-                       senv == NULL ? -1 : CHILD_INFO_TABLE[x].senv->availability
+                       senv == NULL ? 0 : CHILD_INFO_TABLE[x].senv->max_processors,
+                       senv == NULL ? 0 : CHILD_INFO_TABLE[x].senv->availability
                        );
        }
     ap_rputs("</table>\n", r);
-    
+
+    ap_rputs("<hr/><table>"
+                       "<tr><th>STATUS</th><td>Processor status</td></tr>"
+                       "<tr><th>XXX</th><td>XXX</td></tr>"
+                       "<tr><th>Pss</th><td>Number of processors idle/total/max</td></tr>"
+                       "</table><hr/>",r);
+       }
+       
     if (grace_children > 0) {
        ap_rputs("<h2>peruser graceful children status</h2>\n", r);
        ap_rprintf(r, "%d of total %d still living<br />\n", grace_children_alive, grace_children);
@@ -3592,7 +3605,11 @@
 
     if (ap_check_cmd_context(cmd, NOT_IN_VIRTUALHOST) != NULL) {
         sconf = PERUSER_SERVER_CONF(cmd->server->module_config);
-        sconf->senv->min_processors = min_procs;
+        if(sconf->senv != NULL)
+                       sconf->senv->min_processors = min_procs;
+               else
+                       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+                            "WARNING: MinProcessors must be set after ServerEnvironment to take effect");
     }
     else {
         ap_min_processors = min_procs;
@@ -3621,7 +3638,11 @@
 
     if (ap_check_cmd_context(cmd, NOT_IN_VIRTUALHOST) != NULL) {
         sconf = PERUSER_SERVER_CONF(cmd->server->module_config);
-        sconf->senv->min_free_processors = min_free_procs;
+        if(sconf->senv != NULL)
+                       sconf->senv->min_free_processors = min_free_procs;
+               else
+                       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+                            "WARNING: MinSpareProcessors must be set after ServerEnvironment to take effect");
     }
     else {
         ap_min_free_processors = min_free_procs;
@@ -3650,7 +3671,11 @@
 
      if (ap_check_cmd_context(cmd, NOT_IN_VIRTUALHOST) != NULL) {
          sconf = PERUSER_SERVER_CONF(cmd->server->module_config);
-         sconf->senv->max_free_processors = max_free_procs;
+                if(sconf!=NULL)
+                       sconf->senv->max_free_processors = max_free_procs;
+                else
+                       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+                            "WARNING: MaxSpareProcessors must be set after ServerEnvironment to take effect");
      }
      else {
          ap_max_free_processors = max_free_procs;
@@ -3679,7 +3704,11 @@
 
     if (ap_check_cmd_context(cmd, NOT_IN_VIRTUALHOST) != NULL) {
         sconf = PERUSER_SERVER_CONF(cmd->server->module_config);
-        sconf->senv->max_processors = max_procs;
+               if(sconf->senv != NULL)
+               sconf->senv->max_processors = max_procs;
+               else
+                       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+                            "WARNING: MaxProcessors must be set after ServerEnvironment to take effect");
     }
     else {
         ap_max_processors = max_procs;
Index: modules/generators/mod_status.c
===================================================================
--- modules/generators/mod_status.c     (revision 60)
+++ modules/generators/mod_status.c     (working copy)
@@ -205,6 +205,7 @@
 #define STAT_OPT_REFRESH  0
 #define STAT_OPT_NOTABLE  1
 #define STAT_OPT_AUTO     2
+#define STAT_OPT_STATS    3
 
 struct stat_opt {
     int id;
@@ -217,6 +218,7 @@
     {STAT_OPT_REFRESH, "refresh", "Refresh"},
     {STAT_OPT_NOTABLE, "notable", NULL},
     {STAT_OPT_AUTO, "auto", NULL},
+    {STAT_OPT_STATS, "stats", NULL},
     {STAT_OPT_END, NULL, NULL}
 };
 
@@ -241,6 +243,7 @@
 #endif
     int short_report;
     int no_table_report;
+       int stats_report;
     worker_score *ws_record;
     process_score *ps_record;
     char *stat_buffer;
@@ -268,7 +271,8 @@
     kbcount = 0;
     short_report = 0;
     no_table_report = 0;
-
+       stats_report=0;
+       
     pid_buffer = apr_palloc(r->pool, server_limit * sizeof(pid_t));
     stat_buffer = apr_palloc(r->pool, server_limit * thread_limit * sizeof(char));
 
@@ -312,6 +316,9 @@
                 case STAT_OPT_NOTABLE:
                     no_table_report = 1;
                     break;
+               case STAT_OPT_STATS:
+                    stats_report = 1;
+                    break;
                 case STAT_OPT_AUTO:
                     ap_set_content_type(r, "text/plain; charset=ISO-8859-1");
                     short_report = 1;
@@ -819,8 +826,8 @@
         int flags =
             (short_report ? AP_STATUS_SHORT : 0) |
             (no_table_report ? AP_STATUS_NOTABLE : 0) |
-            (ap_extended_status ? AP_STATUS_EXTENDED : 0);
-
+            (ap_extended_status ? AP_STATUS_EXTENDED : 0) |
+                       (stats_report ? AP_STATUS_STATS : 0);
         ap_run_status_hook(r, flags);
     }
 
Index: modules/generators/mod_status.h
===================================================================
--- modules/generators/mod_status.h     (revision 60)
+++ modules/generators/mod_status.h     (working copy)
@@ -32,6 +32,7 @@
 #define AP_STATUS_SHORT    (0x1)  /* short, non-HTML report requested */
 #define AP_STATUS_NOTABLE  (0x2)  /* HTML report without tables */
 #define AP_STATUS_EXTENDED (0x4)  /* detailed report */
+#define AP_STATUS_STATS    (0x8)  /* extended user statistics report */
 
 #if !defined(WIN32)
 #define STATUS_DECLARE(type)            type