Renaming global variables

Author: zielinsky

cputracker.c

@@ -3,11 +3,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int nproc = 0;
-struct proc_stat *BUFFER[BUFFER_SIZE];
-pthread_mutex_t bufferMutex = PTHREAD_MUTEX_INITIALIZER;
-sem_t filledSpaceSemaphore;
-sem_t leftSpaceSemaphore;
+int g_nproc = 0;
+struct proc_stat *g_buffer[BUFFER_SIZE];
+pthread_mutex_t g_bufferMutex = PTHREAD_MUTEX_INITIALIZER;
+sem_t g_filledSpaceSemaphore;
+sem_t g_leftSpaceSemaphore;
 
 int get_nproc(int *nproc) {
   *nproc = sysconf(_SC_NPROCESSORS_ONLN);
@@ -25,25 +25,25 @@ int get_semaphore_value(sem_t *sem) {
 }
 
 int put_item(struct proc_stat *stats) {
-  int index = get_semaphore_value(&filledSpaceSemaphore);
+  int index = get_semaphore_value(&g_filledSpaceSemaphore);
   if (index > BUFFER_SIZE) {
     return -1;
   }
-  BUFFER[index] = stats;
+  g_buffer[index] = stats;
   return 0;
 }
 
 int main() {
-  if (get_nproc(&nproc) == -1) {
+  if (get_nproc(&g_nproc) == -1) {
     exit(EXIT_FAILURE);
   }
 
-  if (sem_init(&filledSpaceSemaphore, 0, 0) ||
-      sem_init(&leftSpaceSemaphore, 0, BUFFER_SIZE)) {
+  if (sem_init(&g_filledSpaceSemaphore, 0, 0) ||
+      sem_init(&g_leftSpaceSemaphore, 0, BUFFER_SIZE)) {
     exit(EXIT_FAILURE);
   }
 
-  nproc++;
+  g_nproc++;
   reader();
   return 0;
 }

cputracker.h

@@ -32,11 +32,11 @@ struct proc_stat {
                   // operating systems under the control of the Linux kernel).
 };
 
-extern int nproc;
-extern struct proc_stat *BUFFER[];
-extern pthread_mutex_t bufferMutex;
-extern sem_t filledSpaceSemaphore;
-extern sem_t leftSpaceSemaphore;
+extern int g_nproc;
+extern struct proc_stat *g_buffer[];
+extern pthread_mutex_t g_bufferMutex;
+extern sem_t g_filledSpaceSemaphore;
+extern sem_t g_leftSpaceSemaphore;
 
 int get_nproc();
 int get_semaphore_value(sem_t *sem);

reader.c

@@ -7,8 +7,8 @@
 struct proc_stat *get_proc_stats() {
   FILE *file = fopen("/proc/stat", "r");
   char line[1024];
-  struct proc_stat *stats = malloc(nproc * sizeof(struct proc_stat));
-  for (int thread = 0; thread < nproc; thread++) {
+  struct proc_stat *stats = malloc(g_nproc * sizeof(struct proc_stat));
+  for (int thread = 0; thread < g_nproc; thread++) {
     fgets(line, sizeof(line), file);
     // assert(strncmp(line, "cpu", 3) == 0);
     if (strncmp(line, "cpu", 3) != 0) {
@@ -35,14 +35,14 @@ void reader() {
       return;
     }
 
-    sem_wait(&leftSpaceSemaphore);
+    sem_wait(&g_leftSpaceSemaphore);
 
-    pthread_mutex_lock(&bufferMutex);
+    pthread_mutex_lock(&g_bufferMutex);
 
     put_item(stats);
 
-    pthread_mutex_unlock(&bufferMutex);
+    pthread_mutex_unlock(&g_bufferMutex);
 
-    sem_post(&filledSpaceSemaphore);
+    sem_post(&g_filledSpaceSemaphore);
   }
 }