Attachment 275696 Details for Bug 394312

[patch] patch for /proc problems

procmeter3-diffs (text/plain), 3.41 KB, created by Harald Koenig on 2009-02-26 13:59:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Koenig

Created: 2009-02-26 13:59:37 UTC

Size: 3.41 KB

patch

obsolete

>diff -u orig//meminfo.c /usr/src/packages/BUILD/procmeter3-3.4a/modules/meminfo.c
>--- orig//meminfo.c	2003-05-10 13:16:27.000000000 +0200
>+++ /usr/src/packages/BUILD/procmeter3-3.4a/modules/meminfo.c	2009-02-26 14:23:06.000000000 +0100
>@@ -192,7 +192,7 @@
>                available[MEM_FREE]=available[MEM_USED]=1;
>              else
>                 fprintf(stderr,"ProcMeter(%s): Expected 'MemTotal' line in '/proc/meminfo'.\n",__FILE__);
>-             fgets(line,80,f); /* MemShared */
>+             // fgets(line,80,f); /* MemShared */
>              if(fgets(line,80,f) && sscanf(line,"Buffers: %llu",&mem_buff)==1)
>                 available[MEM_BUFF]=1;
>              else
>@@ -201,6 +201,9 @@
>                 available[MEM_CACHE]=1;
>              else
>                 fprintf(stderr,"ProcMeter(%s): Expected 'Cached' line in '/proc/meminfo'.\n",__FILE__);
>+             fgets(line,80,f); /* SwapCached */
>+             fgets(line,80,f); /* Active    */
>+             fgets(line,80,f); /* Inactive  */
>              if(fgets(line,80,f) && sscanf(line,"SwapTotal: %llu",&swap_tot)==1 &&
>                 fgets(line,80,f) && sscanf(line,"SwapFree: %llu",&swap_free)==1)
>                 available[SWAP_FREE]=available[SWAP_USED]=1;
>diff -u orig//stat-disk.c /usr/src/packages/BUILD/procmeter3-3.4a/modules/stat-disk.c
>--- orig//stat-disk.c	2003-06-21 20:41:05.000000000 +0200
>+++ /usr/src/packages/BUILD/procmeter3-3.4a/modules/stat-disk.c	2009-02-26 14:26:23.000000000 +0100
>@@ -33,7 +33,7 @@
> #define N_OUTPUTS   3
> 
> /*+ The length of the buffer for reading in lines. +*/
>-#define BUFFLEN 2048
>+#define BUFFLEN 2048*10
> 
> /* The interface information.  */
> 
>@@ -222,7 +222,7 @@
>     fprintf(stderr,"ProcMeter(%s): Could not open '/proc/stat'.\n",__FILE__);
>  else
>    {
>-    l=fgets(line,256,f); /* cpu */
>+    l=fgets(line,BUFFLEN,f); /* cpu */
>     if(!l)
>        fprintf(stderr,"ProcMeter(%s): Could not read '/proc/stat'.\n",__FILE__);
>     else
>diff -u orig//stat.c /usr/src/packages/BUILD/procmeter3-3.4a/modules/stat.c
>--- orig//stat.c	2002-12-07 20:38:59.000000000 +0100
>+++ /usr/src/packages/BUILD/procmeter3-3.4a/modules/stat.c	2009-02-26 14:19:38.000000000 +0100
>@@ -39,7 +39,7 @@
> #define N_OUTPUTS  16
> 
> /*+ The length of the buffer for reading in lines. +*/
>-#define BUFFLEN 2048
>+#define BUFFLEN 2048*10
> 
> /* The interface information.  */
> 
>diff -u orig//wireless.c /usr/src/packages/BUILD/procmeter3-3.4a/modules/wireless.c
>--- orig//wireless.c	2002-12-07 20:39:00.000000000 +0100
>+++ /usr/src/packages/BUILD/procmeter3-3.4a/modules/wireless.c	2009-02-26 14:13:14.000000000 +0100
>@@ -120,12 +120,12 @@
>     if(!fgets(line,256,f))
>        fprintf(stderr,"ProcMeter(%s): Could not read '/proc/net/wireless'.\n",__FILE__);
>     else
>-       if(strcmp(line,"Inter-| sta-|   Quality        |   Discarded packets               | Missed\n"))
>+       if(strcmp(line,"Inter-| sta-|   Quality        |   Discarded packets               | Missed | WE\n"))
>           fprintf(stderr,"ProcMeter(%s): Unexpected header line 1 in '/proc/net/wireless'.\n",__FILE__);
>        else
>          {
>           fgets(line,256,f);
>-          if(strcmp(line," face | tus | link level noise |  nwid  crypt   frag  retry   misc | beacon\n"))
>+          if(strcmp(line," face | tus | link level noise |  nwid  crypt   frag  retry   misc | beacon | 22\n"))
>              fprintf(stderr,"ProcMeter(%s): Unexpected header line 2 in '/proc/net/wireless'.\n",__FILE__);
>           else
>             {

Actions: View | Diff

Attachments on bug 394312: 275696