Re: Problems in latest helper.c

Sorry about this.

Thought I had tested this patch, but obviously not at all.. been a bit
messed up in the last days after working in 5 different Squid trees
at the same time..

Regards
Henrik

On Saturday 07 September 2002 21.55, Guido Serassio wrote:
> Hi Henrik,
>
> It seems to me that in latest helper.c changes something its gone
> wrong. This patch fixes the problems:
>
> Index: helper.c
> ===================================================================
> RCS file: /cvsroot/squid/squid/src/helper.c,v
> retrieving revision 1.16.2.7
> diff -u -p -r1.16.2.7 helper.c
> --- helper.c 7 Sep 2002 16:12:08 -0000 1.16.2.7
> +++ helper.c 7 Sep 2002 19:51:51 -0000
> @@ -104,6 +104,7 @@ helperOpenServers(helper * hlp)
> }
> hlp->n_running++;
> srv = cbdataAlloc(helper_server);
> + srv->pid = x
> srv->flags.alive = 1;
> srv->index = k;
> srv->rfd = rfd;
> @@ -420,7 +421,7 @@ helperStats(StoreEntry * sentry, helper
> storeAppendPrintf(sentry,
> "%7s\t%7s\t%7s\t%11s\t%s\t%7s\t%7s\t%7s\n", "#",
> "FD",
> - "PID"
> + "PID",
> "# Requests",
> "Flags",
> "Time",
> @@ -433,7 +434,7 @@ helperStats(StoreEntry * sentry, helper
> storeAppendPrintf(sentry,
> "%7d\t%7d\t%7d\t%11d\t%c%c%c%c\t%7.3f\t%7d\t%s\n",
> srv->index + 1,
> srv->rfd,
> - src->pid,
> + srv->pid,
> srv->stats.uses,
> srv->flags.alive ? 'A' : ' ',
> srv->flags.busy ? 'B' : ' ',
> Index: structs.h
> ===================================================================
> RCS file: /cvsroot/squid/squid/src/structs.h,v
> retrieving revision 1.48.2.5
> diff -u -p -r1.48.2.5 structs.h
> --- structs.h 28 Aug 2002 21:47:04 -0000 1.48.2.5
> +++ structs.h 7 Sep 2002 19:51:52 -0000
> @@ -2035,6 +2035,7 @@ struct _helper_stateful {
>
> struct _helper_server {
> int index;
> + int pid;
> int rfd;
> int wfd;
> char *buf;
>
> Regards
>
> Guido
>
>
>
> -
> =======================================================
> Serassio Guido
> Via Albenga, 11/4 10134 -
> Torino - ITALY E-mail: guido.serassio@serassio.it
> WWW: http://www.serassio.it
Received on Sat Sep 07 2002 - 18:25:10 MDT