@@ -154,7 +154,7 @@ static const char *const status_lines[RESPONSE_CODES] =
154154apr_shm_t * mrsc_shm ; /* Pointer to shared memory block */
155155char * shmfilename ; /* Shared memory file name, used on some systems */
156156static apr_global_mutex_t * mrsc_mutex = NULL ; /* Lock around shared memory segment access */
157- static char mrsc_mutex_name [ L_tmpnam ] ;
157+ static char * mrsc_mutex_name = NULL ;
158158
159159static const char * mrsc_mutex_type = "mrsc-shm" ;
160160
@@ -250,7 +250,7 @@ static int mrsc_post_config(apr_pool_t *pconf, apr_pool_t *plog,
250250 }
251251
252252 /* Create global mutex */
253- tmpnam ( mrsc_mutex_name );
253+ mrsc_mutex_name = apr_psprintf ( pconf , "/tmp/mrsc_mutex.%ld" , ( long int ) getpid () );
254254
255255 rs = apr_global_mutex_create (& mrsc_mutex , mrsc_mutex_name ,
256256 APR_LOCK_DEFAULT , s -> process -> pool );
@@ -302,11 +302,6 @@ static void mrsc_child_init(apr_pool_t *p, server_rec *s)
302302/* The sample content handler */
303303static int mrsc_handler (request_rec * r )
304304{
305- int gotlock = 0 ;
306- int camped ;
307- apr_time_t startcamp ;
308- apr_int64_t timecamped ;
309- apr_status_t rs ;
310305 mrsc_data * base ;
311306 int i ;
312307
@@ -324,13 +319,13 @@ static int mrsc_handler(request_rec *r)
324319 ap_rputs ("# TYPE http_requests_count_total counter\n" , r );
325320 for (i = 0 ; i < RESPONSE_CODES ; ++ i )
326321 {
327- if (status_lines [i ] == '\0' )
322+ if (status_lines [i ])
328323 {
329- ap_rprintf (r , "http_requests_count_total{status=\"%s apache code %d \"} %d \n" , "unknown" , i , base -> request_status [i ]);
324+ ap_rprintf (r , "http_requests_count_total{status=\"%s\"} %lu \n" , status_lines [ i ] , base -> request_status [i ]);
330325 }
331326 else
332327 {
333- ap_rprintf (r , "http_requests_count_total{status=\"%s\"} %d \n" , status_lines [ i ] , base -> request_status [i ]);
328+ ap_rprintf (r , "http_requests_count_total{status=\"%s apache code %d \"} %lu \n" , "unknown" , i , base -> request_status [i ]);
334329 }
335330 }
336331 }
@@ -339,7 +334,6 @@ static int mrsc_handler(request_rec *r)
339334
340335static int mrsc_request_hook (request_rec * r )
341336{
342- apr_status_t rs ;
343337 mrsc_data * base ;
344338
345339 apr_global_mutex_lock (mrsc_mutex );
@@ -348,7 +342,7 @@ static int mrsc_request_hook(request_rec *r)
348342 apr_global_mutex_unlock (mrsc_mutex );
349343
350344 ap_log_error (APLOG_MARK , APLOG_DEBUG , 0 , r -> server ,
351- "counter %i is at %d " , r -> status , base -> request_status [ap_index_of_response (r -> status )]);
345+ "counter %i is at %lu " , r -> status , base -> request_status [ap_index_of_response (r -> status )]);
352346
353347 return OK ;
354348}
0 commit comments