Fix warnings for clang

Author: zielinsky

Makefile

@@ -1,5 +1,7 @@
 CC = gcc -g
-CFLAGS = -O3 -Wall -Werror
+CFLAGS = -O3 -Wall -Werror -pthread
+# CC = clang
+# CFLAGS = -Weverything -pthread
 
 OBJS = reader.o cputracker.o analyzer.o printer.o
 

analyzer.c

@@ -1,7 +1,7 @@
 #include "analyzer.h"
 #include "cputracker.h"
 
-unsigned long average_cpu_usage(struct proc_stat prev,
+static unsigned long average_cpu_usage(struct proc_stat prev,
                                 struct proc_stat current) {
   unsigned long prevIdle = prev.idle + prev.iowait;
   unsigned long idle = current.idle + current.iowait;
@@ -20,9 +20,10 @@ unsigned long average_cpu_usage(struct proc_stat prev,
   return (total - idle) * 100 / total;
 }
 
-void *analyzer() {
-  struct proc_stat *prev = malloc(g_nproc * sizeof(struct proc_stat));
-  unsigned long *avg = malloc(g_nproc * sizeof(unsigned long));
+void *analyzer(void) {
+  struct proc_stat *prev = malloc((unsigned long)g_nproc * sizeof(struct proc_stat));
+  unsigned long *avg = malloc((unsigned long)g_nproc * sizeof(unsigned long));
+  unsigned long *bufforAvg;
   struct proc_stat *stats = NULL;
   while (1) {
     sem_wait(&g_dataFilledSpaceSemaphore);
@@ -45,13 +46,13 @@ void *analyzer() {
 
     pthread_mutex_lock(&g_printBufferMutex);
 
-    unsigned long *bufforAvg = get_item_from_print_buffer();
-    memcpy(bufforAvg, avg, g_nproc * sizeof(unsigned long));
+    bufforAvg = get_item_from_print_buffer();
+    memcpy(bufforAvg, avg, (unsigned long)g_nproc * sizeof(unsigned long));
 
     pthread_mutex_unlock(&g_printBufferMutex);
 
     sem_post(&g_printFilledSpaceSemaphore);
   }
   free(prev);
   free(avg);
-}
+}

analyzer.h

@@ -2,6 +2,5 @@
 #define ANALYZER_H
 #include "cputracker.h"
 
-void *analyzer();
-unsigned long average_cpu_usage(struct proc_stat prev, struct proc_stat next);
-#endif
+void *analyzer(void);
+#endif

cputracker.c

@@ -3,54 +3,56 @@
 #include "printer.h"
 #include "reader.h"
 
+volatile sig_atomic_t done = 0;
+
 int g_nproc = 0;
-struct proc_stat *g_dataBuffer[BUFFER_SIZE];
+static struct proc_stat *g_dataBuffer[BUFFER_SIZE];
 pthread_mutex_t g_dataBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 sem_t g_dataFilledSpaceSemaphore;
 sem_t g_dataLeftSpaceSemaphore;
 
-unsigned long *g_printBuffer[BUFFER_SIZE];
+static unsigned long *g_printBuffer[BUFFER_SIZE];
 pthread_mutex_t g_printBufferMutex = PTHREAD_MUTEX_INITIALIZER;
 sem_t g_printFilledSpaceSemaphore;
 sem_t g_printLeftSpaceSemaphore;
 
-pthread_t readerThreadId;
-pthread_t analyzerThreadId;
-pthread_t printerThreadId;
+static pthread_t readerThreadId;
+static pthread_t analyzerThreadId;
+static pthread_t printerThreadId;
 
-int get_nproc(int *nproc) {
-  *nproc = sysconf(_SC_NPROCESSORS_ONLN);
+static int get_nproc(int *nproc) {
+  *nproc = (int)sysconf(_SC_NPROCESSORS_ONLN);
   if (*nproc == -1) {
     return -1;
   }
   return 0;
 }
 
-int get_semaphore_value(sem_t *sem) {
+static int get_semaphore_value(sem_t *sem) {
   int sval;
   sem_getvalue(sem, &sval);
   return sval;
 }
 
-struct proc_stat *get_item_from_data_buffer() {
+struct proc_stat *get_item_from_data_buffer(void) {
   int index = get_semaphore_value(&g_dataFilledSpaceSemaphore);
   return g_dataBuffer[index];
 }
 
-unsigned long *get_item_from_print_buffer() {
+unsigned long *get_item_from_print_buffer(void) {
   int index = get_semaphore_value(&g_printFilledSpaceSemaphore);
   return g_printBuffer[index];
 }
 
-int main() {
+int main(void) {
   if (get_nproc(&g_nproc) == -1) {
     exit(EXIT_FAILURE);
   }
   g_nproc++;
 
   for (int i = 0; i < BUFFER_SIZE; i++) {
-    g_dataBuffer[i] = malloc(g_nproc * sizeof(struct proc_stat));
-    g_printBuffer[i] = malloc(g_nproc * sizeof(unsigned long));
+    g_dataBuffer[i] = malloc((unsigned long)g_nproc * sizeof(struct proc_stat));
+    g_printBuffer[i] = malloc((unsigned long)g_nproc * sizeof(unsigned long));
     if (g_dataBuffer[i] == NULL || g_printBuffer[i] == NULL) {
       exit(EXIT_FAILURE);
     }
@@ -86,4 +88,4 @@ int main() {
     free(g_printBuffer[i]);
   }
   return 0;
-}
+}

cputracker.h

@@ -33,19 +33,17 @@ struct proc_stat {
                   // operating systems under the control of the Linux kernel).
 };
 
+extern volatile sig_atomic_t done;
+
 extern int g_nproc;
-extern struct proc_stat *g_dataBuffer[];
 extern pthread_mutex_t g_dataBufferMutex;
 extern sem_t g_dataFilledSpaceSemaphore;
 extern sem_t g_dataLeftSpaceSemaphore;
 
-extern unsigned long *g_printBuffer[BUFFER_SIZE];
 extern pthread_mutex_t g_printBufferMutex;
 extern sem_t g_printFilledSpaceSemaphore;
 extern sem_t g_printLeftSpaceSemaphore;
 
-int get_nproc(int *nproc);
-int get_semaphore_value(sem_t *sem);
-unsigned long *get_item_from_print_buffer();
-struct proc_stat *get_item_from_data_buffer();
-#endif
+unsigned long *get_item_from_print_buffer(void);
+struct proc_stat *get_item_from_data_buffer(void);
+#endif

printer.c

@@ -1,6 +1,6 @@
 #include "printer.h"
 
-void *printer() {
+void *printer(void) {
   unsigned long *avg = NULL;
   while (1) {
     sem_wait(&g_printFilledSpaceSemaphore);
@@ -22,4 +22,4 @@ void *printer() {
     sem_post(&g_printLeftSpaceSemaphore);
     sleep(1);
   }
-}
+}

printer.h

@@ -2,5 +2,5 @@
 #define PRINTER_H
 #include "cputracker.h"
 
-void *printer();
-#endif
+void *printer(void);
+#endif

reader.c

@@ -1,12 +1,11 @@
 #include "reader.h"
 
-int get_proc_stats(struct proc_stat *stats) {
+static int get_proc_stats(struct proc_stat *stats) {
   FILE *file = fopen("/proc/stat", "r");
   char line[1024];
   for (int thread = 0; thread < g_nproc; thread++) {
-    fgets(line, sizeof(line), file);
-    if (strncmp(line, "cpu", 3) != 0) {
-      perror("Reading thread info failed");
+    if (fgets(line, sizeof(line), file) == NULL ||
+        strncmp(line, "cpu", 3) != 0) {
       fclose(file);
       return -1;
     }
@@ -21,7 +20,7 @@ int get_proc_stats(struct proc_stat *stats) {
   return 0;
 }
 
-void *reader() {
+void *reader(void) {
   struct proc_stat *stats = NULL;
   while (1) {
 
@@ -41,4 +40,4 @@ void *reader() {
     sem_post(&g_dataFilledSpaceSemaphore);
     usleep(READ_DELAY);
   }
-}
+}

reader.h

@@ -4,7 +4,5 @@
 
 #define READ_DELAY 50000
 
-int get_proc_stats(struct proc_stat *stats);
-void *reader();
-
-#endif
+void *reader(void);
+#endif