/netkit-rusers-0.17-procps.patch

# · Patch · 100 lines · 93 code · 7 blank · 0 comment · 0 complexity · 43e77c779861d8c54a00baf9ba7c2900 MD5 · raw file 

    

  1. --- netkit-rusers-0.17/rpc.rstatd/GNUmakefile.procps	2004-07-12 17:41:48.179608944 +0200
    2. 

  2. +++ netkit-rusers-0.17/rpc.rstatd/GNUmakefile	2004-07-12 17:41:48.190607585 +0200
    3. 

  3. @@ -6,10 +6,6 @@
    4. 

  4.  CFLAGS += -DGNU_LIBC -D_GNU_SOURCE
    5. 

  5.  endif
    6. 

  6.  
    7. 

  7. -#LIBS += -lproc
    8. 

  8. -# XXX FIXME!
    9. 

  9. -LIBS += /lib/$(shell cd /lib && echo libproc.so.*)
    10. 

  10. -
    11. 

  11.  RPCGEN=rpcgen
    12. 

  12.  
    13. 

  13.  # Warning, do not put this in the current directory without updating
    14. 

  14. --- netkit-rusers-0.17/rpc.rstatd/rstat_proc.c.procps	2004-07-12 17:41:48.174609561 +0200
    15. 

  15. +++ netkit-rusers-0.17/rpc.rstatd/rstat_proc.c	2004-07-12 17:55:36.605332290 +0200
    16. 

  16. @@ -45,6 +45,7 @@
    17. 

  17.  #include <string.h>
    18. 

  18.  #include <signal.h>
    19. 

  19.  #include <fcntl.h>
    20. 

  20. +#include <locale.h>
    21. 

  21.  
    22. 

  22.  #include <limits.h>
    23. 

  23.  #include <rpc/rpc.h>
    24. 

  24. @@ -596,27 +597,71 @@
    25. 

  25.  #define	_DELTA(_x, _i)	( (_x)[(_i)] )
    26. 

  26.  #endif
    27. 

  27.  
    28. 

  28. -extern int uptime(double *, double *);
    29. 

  29. -extern void loadavg(double *, double *, double *);
    30. 

  30. -
    31. 

  31.  static void
    32. 

  32.  convert_stats(void)
    33. 

  33.  {
    34. 

  34.  	static int tog = 0;
    35. 

  35.  	double up;
    36. 

  36.  	int i;
    37. 

  37. +	int fd;
    38. 

  38. +	static char buf[1024];
    39. 

  39. +	char *savelocale;
    40. 

  40.  
    41. 

  41.  	hz = sysconf(_SC_CLK_TCK);
    42. 

  42.  	gettimeofday(&tm, (struct timezone *) 0);
    43. 

  43.  
    44. 

  44. -	i = uptime(&up, NULL);
    45. 

  45. +	fd = open("/proc/uptime", O_RDONLY);
    46. 

  46. +	if (fd == -1) {
    47. 

  47. +		fprintf(stderr, "Error opening /proc/uptime, please make sure /proc is mounted.\n");
    48. 

  48. +		exit(1);
    49. 

  49. +	}
    50. 

  50. +
    51. 

  51. +	i = read(fd, buf, sizeof(buf) - 1);
    52. 

  52. +	if (i < 0) {
    53. 

  53. +		perror("/proc/uptime");
    54. 

  54. +		close(fd);
    55. 

  55. +		exit(1);
    56. 

  56. +	}
    57. 

  57. +	buf[i] = '\0';
    58. 

  58. +	savelocale = setlocale(LC_NUMERIC, NULL);
    59. 

  59. +	setlocale(LC_NUMERIC, "C");
    60. 

  60. +	if (sscanf(buf, "%lf", &up) < 1) {
    61. 

  61. +		fprintf(stderr, "bad data in /proc/uptime\n");
    62. 

  62. +		exit(1);
    63. 

  63. +	}
    64. 

  64. +	setlocale(LC_NUMERIC, savelocale);
    65. 

  65. +	close(fd);
    66. 

  66. +
    67. 

  67. +	i = (int)up;
    68. 

  68. +
    69. 

  69.  	btm.tv_sec = tm.tv_sec - i;
    70. 

  70.  	btm.tv_usec = 0;
    71. 

  71.  	up -= i;
    72. 

  72.  	if (up > 0)
    73. 

  73.  		btm.tv_usec = 1000000 * up;
    74. 

  74.  
    75. 

  75. -	loadavg(&avrun[0], &avrun[1], &avrun[2]);
    76. 

  76. +	fd = open("/proc/loadavg", O_RDONLY);
    77. 

  77. +	if (fd == -1) {
    78. 

  78. +		fprintf(stderr, "Error opening /proc/loadavg, please make sure /proc is mounted.\n");
    79. 

  79. +		exit(1);
    80. 

  80. +	}
    81. 

  81. +
    82. 

  82. +	i = read(fd, buf, sizeof(buf) - 1);
    83. 

  83. +	if (i < 0) {
    84. 

  84. +		perror("/proc/loadavg");
    85. 

  85. +		close(fd);
    86. 

  86. +		exit(1);
    87. 

  87. +	}
    88. 

  88. +	buf[i] = '\0';
    89. 

  89. +	savelocale = setlocale(LC_NUMERIC, NULL);
    90. 

  90. +	setlocale(LC_NUMERIC, "C");
    91. 

  91. +	if (sscanf(buf, "%lf %lf %lf", &avrun[0], &avrun[1], &avrun[2]) < 3) {
    92. 

  92. +		fprintf(stderr, "bad data in /proc/loadavg\n");
    93. 

  93. +		exit(1);
    94. 

  94. +	}
    95. 

  95. +	setlocale(LC_NUMERIC, savelocale);
    96. 

  96. +	close(fd);
    97. 

  97. +
    98. 

  98.  	getstat(cpu_use+tog,cpu_nic+tog,cpu_sys+tog,cpu_idl+tog,
    99. 

  99.  		pgpgin+tog,pgpgout+tog,pswpin+tog,pswpout+tog,
    100. 

  100.  		inter+tog,ticks+tog,ctxt+tog, disk+tog);
    101.