[lcd4linux @ 2005-05-08 04:32:43 by reinelt]

CodingStyle added and applied

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@547 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

1 files changed, 245 insertions, 216 deletions

diff --git a/plugin_proc_stat.c b/plugin_proc_stat.c
index 84f4810..55d7d81 100644
--- a/plugin_proc_stat.c
+++ b/plugin_proc_stat.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_proc_stat.c,v 1.25 2005/01/18 06:30:23 reinelt Exp $
+/* $Id: plugin_proc_stat.c,v 1.26 2005/05/08 04:32:45 reinelt Exp $
  *
  * plugin for /proc/stat parsing
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: plugin_proc_stat.c,v $
+ * Revision 1.26  2005/05/08 04:32:45  reinelt
+ * CodingStyle added and applied
+ *
  * Revision 1.25  2005/01/18 06:30:23  reinelt
  * added (C) to all copyright statements
  *
@@ -151,253 +154,279 @@ static HASH Stat;
 static FILE *stream = NULL;
 
 
-static void hash_put1 (const char *key1, const char *val) 
+static void hash_put1(const char *key1, const char *val)
 {
-  hash_put_delta (&Stat, key1, val);
+    hash_put_delta(&Stat, key1, val);
 }
 
 
-static void hash_put2 (const char *key1, const char *key2, const char *val) 
+static void hash_put2(const char *key1, const char *key2, const char *val)
 {
-  char key[32];
-  
-  qprintf(key, sizeof(key), "%s.%s", key1, key2);
-  hash_put1 (key, val);
+    char key[32];
+
+    qprintf(key, sizeof(key), "%s.%s", key1, key2);
+    hash_put1(key, val);
 }
 
 
-static void hash_put3 (const char *key1, const char *key2, const char *key3, const char *val) 
+static void hash_put3(const char *key1, const char *key2, const char *key3, const char *val)
 {
-  char key[32];
-  
-  qprintf(key, sizeof(key), "%s.%s.%s", key1, key2, key3);
-  hash_put1 (key, val);
+    char key[32];
+
+    qprintf(key, sizeof(key), "%s.%s.%s", key1, key2, key3);
+    hash_put1(key, val);
 }
 
 
-static int parse_proc_stat (void)
+static int parse_proc_stat(void)
 {
-  int age;
-  
-  /* reread every 10 msec only */
-  age=hash_age(&Stat, NULL);
-  if (age>0 && age<=10) return 0;
-  
-  if (stream==NULL) stream=fopen("/proc/stat", "r");
-  if (stream==NULL) {
-    error ("fopen(/proc/stat) failed: %s", strerror(errno));
-    return -1;
-  }
-  
-  rewind(stream);
-  
-  while (!feof(stream)) {
-    char buffer[1024];
-    if (fgets (buffer, sizeof(buffer), stream) == NULL) break;
-    
-    if (strncmp(buffer, "cpu", 3)==0) {
-      char *key[]  = { "user", "nice", "system", "idle" }; 
-      char delim[] = " \t\n";
-      char *cpu, *beg, *end; 
-      int i;
-      
-      cpu=buffer;
-      
-      /* skip "cpu" or "cpu0" block */
-      if ((end=strpbrk(buffer, delim))!=NULL) *end='\0'; 
-      beg=end?end+1:NULL;
-      
-      for (i=0; i<4 && beg!=NULL; i++) {
-	while (strchr(delim, *beg)) beg++; 
-	if ((end=strpbrk(beg, delim))) *end='\0'; 
-	hash_put2 (cpu, key[i], beg); 
-	beg=end?end+1:NULL;
-      }
-    } 
-
-    else if (strncmp(buffer, "page ", 5)==0) {
-      char *key[]  = { "in", "out" }; 
-      char delim[] = " \t\n";
-      char *beg, *end;
-      int i;
-      
-      for (i=0, beg=buffer+5; i<2 && beg!=NULL; i++) {
-	while (strchr(delim, *beg)) beg++; 
-	if ((end=strpbrk(beg, delim))) *end='\0'; 
-	hash_put2 ("page", key[i], beg); 
-	beg=end?end+1:NULL;
-      }
-    } 
-    
-    else if (strncmp(buffer, "swap ", 5)==0) {
-      char *key[]  = { "in", "out" }; 
-      char delim[] = " \t\n";
-      char *beg, *end;
-      int i;
-      
-      for (i=0, beg=buffer+5; i<2 && beg!=NULL; i++) {
-	while (strchr(delim, *beg)) beg++; 
-	if ((end=strpbrk(beg, delim))) *end='\0'; 
-	hash_put2 ("swap", key[i], beg); 
-	beg=end?end+1:NULL;
-      }
-    } 
-
-    else if (strncmp(buffer, "intr ", 5)==0) {
-      char delim[]=" \t\n";
-      char *beg, *end, num[4];
-      int i;
-      
-      for (i=0, beg=buffer+5; i<17 && beg!=NULL; i++) {
-	while (strchr(delim, *beg)) beg++; 
-	if ((end=strpbrk(beg, delim))) *end='\0'; 
-	if (i==0) 
-	  strcpy(num, "sum");
-	else 
-	  qprintf(num, sizeof(num), "%d", i-1);
-	hash_put2 ("intr", num,  beg);
-	beg=end?end+1:NULL;
-      }
-    } 
-
-    else if (strncmp(buffer, "disk_io:", 8)==0) {
-      char *key[]  = { "io", "rio", "rblk", "wio", "wblk" }; 
-      char delim[] = " ():,\t\n";
-      char *dev, *beg, *end, *p;
-      int i;
-      
-      dev=buffer+8;
-      while (dev!=NULL) {
-	while (strchr(delim, *dev)) dev++; 
-	if ((end=strchr(dev, ')'))) *end='\0'; 
-	while ((p=strchr(dev, ','))!=NULL) *p=':';
-	beg=end?end+1:NULL;
-	for (i=0; i<5 && beg!=NULL; i++) {
-	  while (strchr(delim, *beg)) beg++; 
-	  if ((end=strpbrk(beg, delim))) *end='\0'; 
-	  hash_put3 ("disk_io", dev, key[i], beg); 
-	  beg=end?end+1:NULL;
+    int age;
+
+    /* reread every 10 msec only */
+    age = hash_age(&Stat, NULL);
+    if (age > 0 && age <= 10)
+	return 0;
+
+    if (stream == NULL)
+	stream = fopen("/proc/stat", "r");
+    if (stream == NULL) {
+	error("fopen(/proc/stat) failed: %s", strerror(errno));
+	return -1;
+    }
+
+    rewind(stream);
+
+    while (!feof(stream)) {
+	char buffer[1024];
+	if (fgets(buffer, sizeof(buffer), stream) == NULL)
+	    break;
+
+	if (strncmp(buffer, "cpu", 3) == 0) {
+	    char *key[] = { "user", "nice", "system", "idle" };
+	    char delim[] = " \t\n";
+	    char *cpu, *beg, *end;
+	    int i;
+
+	    cpu = buffer;
+
+	    /* skip "cpu" or "cpu0" block */
+	    if ((end = strpbrk(buffer, delim)) != NULL)
+		*end = '\0';
+	    beg = end ? end + 1 : NULL;
+
+	    for (i = 0; i < 4 && beg != NULL; i++) {
+		while (strchr(delim, *beg))
+		    beg++;
+		if ((end = strpbrk(beg, delim)))
+		    *end = '\0';
+		hash_put2(cpu, key[i], beg);
+		beg = end ? end + 1 : NULL;
+	    }
+	}
+
+	else if (strncmp(buffer, "page ", 5) == 0) {
+	    char *key[] = { "in", "out" };
+	    char delim[] = " \t\n";
+	    char *beg, *end;
+	    int i;
+
+	    for (i = 0, beg = buffer + 5; i < 2 && beg != NULL; i++) {
+		while (strchr(delim, *beg))
+		    beg++;
+		if ((end = strpbrk(beg, delim)))
+		    *end = '\0';
+		hash_put2("page", key[i], beg);
+		beg = end ? end + 1 : NULL;
+	    }
+	}
+
+	else if (strncmp(buffer, "swap ", 5) == 0) {
+	    char *key[] = { "in", "out" };
+	    char delim[] = " \t\n";
+	    char *beg, *end;
+	    int i;
+
+	    for (i = 0, beg = buffer + 5; i < 2 && beg != NULL; i++) {
+		while (strchr(delim, *beg))
+		    beg++;
+		if ((end = strpbrk(beg, delim)))
+		    *end = '\0';
+		hash_put2("swap", key[i], beg);
+		beg = end ? end + 1 : NULL;
+	    }
+	}
+
+	else if (strncmp(buffer, "intr ", 5) == 0) {
+	    char delim[] = " \t\n";
+	    char *beg, *end, num[4];
+	    int i;
+
+	    for (i = 0, beg = buffer + 5; i < 17 && beg != NULL; i++) {
+		while (strchr(delim, *beg))
+		    beg++;
+		if ((end = strpbrk(beg, delim)))
+		    *end = '\0';
+		if (i == 0)
+		    strcpy(num, "sum");
+		else
+		    qprintf(num, sizeof(num), "%d", i - 1);
+		hash_put2("intr", num, beg);
+		beg = end ? end + 1 : NULL;
+	    }
+	}
+
+	else if (strncmp(buffer, "disk_io:", 8) == 0) {
+	    char *key[] = { "io", "rio", "rblk", "wio", "wblk" };
+	    char delim[] = " ():,\t\n";
+	    char *dev, *beg, *end, *p;
+	    int i;
+
+	    dev = buffer + 8;
+	    while (dev != NULL) {
+		while (strchr(delim, *dev))
+		    dev++;
+		if ((end = strchr(dev, ')')))
+		    *end = '\0';
+		while ((p = strchr(dev, ',')) != NULL)
+		    *p = ':';
+		beg = end ? end + 1 : NULL;
+		for (i = 0; i < 5 && beg != NULL; i++) {
+		    while (strchr(delim, *beg))
+			beg++;
+		    if ((end = strpbrk(beg, delim)))
+			*end = '\0';
+		    hash_put3("disk_io", dev, key[i], beg);
+		    beg = end ? end + 1 : NULL;
+		}
+		dev = beg;
+	    }
+	}
+
+	else {
+	    char delim[] = " \t\n";
+	    char *beg, *end;
+
+	    beg = buffer;
+	    if ((end = strpbrk(beg, delim)))
+		*end = '\0';
+	    beg = end ? end + 1 : NULL;
+	    if ((end = strpbrk(beg, delim)))
+		*end = '\0';
+	    while (strchr(delim, *beg))
+		beg++;
+	    hash_put1(buffer, beg);
 	}
-	dev=beg;
-      } 
     }
-    
-    else {
-      char delim[] = " \t\n";
-      char *beg, *end;
-
-      beg=buffer;
-      if ((end=strpbrk(beg, delim))) *end='\0'; 
-      beg=end?end+1:NULL;
-      if ((end=strpbrk(beg, delim))) *end='\0'; 
-      while (strchr(delim, *beg)) beg++; 
-      hash_put1 (buffer, beg);
-    } 
-  }
-  return 0;
+    return 0;
 }
 
 
-static void my_proc_stat (RESULT *result, const int argc, RESULT *argv[])
+static void my_proc_stat(RESULT * result, const int argc, RESULT * argv[])
 {
-  char  *string;
-  double number;
-  
-  if (parse_proc_stat()<0) {
-    SetResult(&result, R_STRING, ""); 
-    return;
-  }
-  
-  switch (argc) {
-  case 1:
-    string=hash_get(&Stat, R2S(argv[0]), NULL);
-    if (string==NULL) string="";
-    SetResult(&result, R_STRING, string); 
-    break;
-  case 2:
-    number=hash_get_delta(&Stat, R2S(argv[0]), NULL, R2N(argv[1]));
-    SetResult(&result, R_NUMBER, &number); 
-    break;
-  default:
-    error ("proc_stat(): wrong number of parameters");
-    SetResult(&result, R_STRING, ""); 
-  }
+    char *string;
+    double number;
+
+    if (parse_proc_stat() < 0) {
+	SetResult(&result, R_STRING, "");
+	return;
+    }
+
+    switch (argc) {
+    case 1:
+	string = hash_get(&Stat, R2S(argv[0]), NULL);
+	if (string == NULL)
+	    string = "";
+	SetResult(&result, R_STRING, string);
+	break;
+    case 2:
+	number = hash_get_delta(&Stat, R2S(argv[0]), NULL, R2N(argv[1]));
+	SetResult(&result, R_NUMBER, &number);
+	break;
+    default:
+	error("proc_stat(): wrong number of parameters");
+	SetResult(&result, R_STRING, "");
+    }
 }
 
 
-static void my_cpu (RESULT *result, RESULT *arg1, RESULT *arg2)
+static void my_cpu(RESULT * result, RESULT * arg1, RESULT * arg2)
 {
-  char *key;
-  int delay;
-  double value;
-  double cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_total;
-  
-  if (parse_proc_stat()<0) {
-    SetResult(&result, R_STRING, ""); 
-    return;
-  }
-  
-  key   = R2S(arg1);
-  delay = R2N(arg2);
-  
-  cpu_user   = hash_get_delta(&Stat, "cpu.user",   NULL, delay);
-  cpu_nice   = hash_get_delta(&Stat, "cpu.nice",   NULL, delay);
-  cpu_system = hash_get_delta(&Stat, "cpu.system", NULL, delay);
-  cpu_idle   = hash_get_delta(&Stat, "cpu.idle",   NULL, delay);
-
-  cpu_total  = cpu_user+cpu_nice+cpu_system+cpu_idle;
-  
-  if      (strcasecmp(key, "user"  )==0) value=cpu_user;
-  else if (strcasecmp(key, "nice"  )==0) value=cpu_nice;
-  else if (strcasecmp(key, "system")==0) value=cpu_system;
-  else if (strcasecmp(key, "idle"  )==0) value=cpu_idle;
-  else if (strcasecmp(key, "busy"  )==0) value=cpu_total-cpu_idle;
-  
-  if (cpu_total>0.0)
-    value = 100*value/cpu_total;
-  else
-    value=0.0;
-
-  SetResult(&result, R_NUMBER, &value); 
+    char *key;
+    int delay;
+    double value;
+    double cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_total;
+
+    if (parse_proc_stat() < 0) {
+	SetResult(&result, R_STRING, "");
+	return;
+    }
+
+    key = R2S(arg1);
+    delay = R2N(arg2);
+
+    cpu_user = hash_get_delta(&Stat, "cpu.user", NULL, delay);
+    cpu_nice = hash_get_delta(&Stat, "cpu.nice", NULL, delay);
+    cpu_system = hash_get_delta(&Stat, "cpu.system", NULL, delay);
+    cpu_idle = hash_get_delta(&Stat, "cpu.idle", NULL, delay);
+
+    cpu_total = cpu_user + cpu_nice + cpu_system + cpu_idle;
+
+    if (strcasecmp(key, "user") == 0)
+	value = cpu_user;
+    else if (strcasecmp(key, "nice") == 0)
+	value = cpu_nice;
+    else if (strcasecmp(key, "system") == 0)
+	value = cpu_system;
+    else if (strcasecmp(key, "idle") == 0)
+	value = cpu_idle;
+    else if (strcasecmp(key, "busy") == 0)
+	value = cpu_total - cpu_idle;
+
+    if (cpu_total > 0.0)
+	value = 100 * value / cpu_total;
+    else
+	value = 0.0;
+
+    SetResult(&result, R_NUMBER, &value);
 }
 
 
-static void my_disk (RESULT *result, RESULT *arg1, RESULT *arg2, RESULT *arg3)
+static void my_disk(RESULT * result, RESULT * arg1, RESULT * arg2, RESULT * arg3)
 {
-  char *dev, *key, buffer[32];
-  int delay;
-  double value;
-  
-  if (parse_proc_stat()<0) {
-    SetResult(&result, R_STRING, ""); 
-    return;
-  }
-  
-  dev   = R2S(arg1);
-  key   = R2S(arg2);
-  delay = R2N(arg3);
-  
-  qprintf(buffer, sizeof(buffer), "disk_io\\.%s\\.%s", dev, key);
-  value  = hash_get_regex(&Stat, buffer, NULL, delay);
-  
-  SetResult(&result, R_NUMBER, &value); 
+    char *dev, *key, buffer[32];
+    int delay;
+    double value;
+
+    if (parse_proc_stat() < 0) {
+	SetResult(&result, R_STRING, "");
+	return;
+    }
+
+    dev = R2S(arg1);
+    key = R2S(arg2);
+    delay = R2N(arg3);
+
+    qprintf(buffer, sizeof(buffer), "disk_io\\.%s\\.%s", dev, key);
+    value = hash_get_regex(&Stat, buffer, NULL, delay);
+
+    SetResult(&result, R_NUMBER, &value);
 }
 
 
-int plugin_init_proc_stat (void)
+int plugin_init_proc_stat(void)
 {
-  hash_create(&Stat);
-  AddFunction ("proc_stat",      -1, my_proc_stat);
-  AddFunction ("proc_stat::cpu",  2, my_cpu);
-  AddFunction ("proc_stat::disk", 3, my_disk);
-  return 0;
+    hash_create(&Stat);
+    AddFunction("proc_stat", -1, my_proc_stat);
+    AddFunction("proc_stat::cpu", 2, my_cpu);
+    AddFunction("proc_stat::disk", 3, my_disk);
+    return 0;
 }
 
-void plugin_exit_proc_stat(void) 
+void plugin_exit_proc_stat(void)
 {
-  if (stream!=NULL) {
-    fclose (stream);
-    stream=NULL;
-  }
-  hash_destroy(&Stat);
+    if (stream != NULL) {
+	fclose(stream);
+	stream = NULL;
+    }
+    hash_destroy(&Stat);
 }