Attachment #19706 for bug #30730

View | Details | Raw Unified | Return to bug 30730
Collapse All | Expand All

Lines 339-344 Link Here

(-)server/scoreboard.c (-3 / +16 lines)
339	return (ap_scoreboard_image ? 1 : 0);	339	return (ap_scoreboard_image ? 1 : 0);
340	}	340	}
341		341
		342	static void increment_bytes(worker_score ws, request_rec r)
		343	{
		344	ws->bytes_served += r->bytes_sent;
		345	ws->my_bytes_served += r->bytes_sent;
		346	ws->conn_bytes += r->bytes_sent;
		347	}
		348
342	AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t sb, request_rec r)	349	AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t sb, request_rec r)
343	{	350	{
344	worker_score *ws;	351	worker_score *ws;
Lines 351-361 Link Here
351	ws->access_count++;	358	ws->access_count++;
352	ws->my_access_count++;	359	ws->my_access_count++;
353	ws->conn_count++;	360	ws->conn_count++;
354	ws->bytes_served += r->bytes_sent;	361	increment_bytes(ws, r);
355	ws->my_bytes_served += r->bytes_sent;
356	ws->conn_bytes += r->bytes_sent;
357	}	362	}
358		363
		364	AP_DECLARE(void) ap_increment_bytes(ap_sb_handle_t sb, request_rec r)
		365	{
		366	worker_score *ws;
		367
		368	ws = &ap_scoreboard_image->servers[sb->child_num][sb->thread_num];
		369	increment_bytes(ws, r);
		370	}
		371
359	int find_child_by_pid(apr_proc_t *pid)	372	int find_child_by_pid(apr_proc_t *pid)
360	{	373	{
361	int i;	374	int i;

Lines 173-178 Link Here

(-)include/scoreboard.h (+1 lines)
173		173
174	AP_DECLARE(int) ap_exists_scoreboard_image(void);	174	AP_DECLARE(int) ap_exists_scoreboard_image(void);
175	AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t sbh, request_rec r);	175	AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t sbh, request_rec r);
		176	AP_DECLARE(void) ap_increment_bytes(ap_sb_handle_t sbh, request_rec r);
176		177
177	int ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e t);	178	int ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e t);
178	apr_status_t ap_reopen_scoreboard(apr_pool_t p, apr_shm_t *shm, int detached);	179	apr_status_t ap_reopen_scoreboard(apr_pool_t p, apr_shm_t *shm, int detached);

Lines 508-513 Link Here

(-)modules/http/http_request.c (+3 lines)
508	return;	508	return;
509	}	509	}
510	ap_finalize_request_protocol(new);	510	ap_finalize_request_protocol(new);
		511	if (ap_extended_status && new->connection) {
		512	ap_increment_bytes(new->connection->sbh, new);
		513	}
511	}	514	}
512	else {	515	else {
513	ap_die(access_status, new);	516	ap_die(access_status, new);

Return to bug 30730