Add analyzer thread

Author: zielinsky

.gitignore

@@ -6,3 +6,4 @@ reader
 reader.o
 cputracker.o
 cputracker
+analyzer.o

Makefile

@@ -1,12 +1,13 @@
 CC = gcc -g
 CFLAGS = -O3 -Wall -Werror
 
-OBJS = reader.o cputracker.o
+OBJS = reader.o cputracker.o analyzer.o
 
 reader: $(OBJS)
 	$(CC) $(CFLAGS) -o cputracker $(OBJS)
 
 reader.o: reader.c reader.h cputracker.h
+analyzer.o: analyzer.c analyzer.h cputracker.h
 cputracker.o: cputracker.c reader.h cputracker.h 
 
 format:

analyzer.c

@@ -0,0 +1,24 @@
+#include "analyzer.h"
+#include "cputracker.h"
+#include <stdio.h>
+int x = 0;
+
+void *analyzer() {
+  while (1) {
+    sem_wait(&g_filledSpaceSemaphore);
+    pthread_mutex_lock(&g_bufferMutex);
+
+    struct proc_stat *stats = remove_item();
+
+    pthread_mutex_unlock(&g_bufferMutex);
+    sem_post(&g_leftSpaceSemaphore);
+
+    for (int i = 0; i < g_nproc; i++) {
+      printf("%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu\n", stats[i].name,
+             stats[i].user, stats[i].nice, stats[i].system, stats[i].idle,
+             stats[i].iowait, stats[i].irq, stats[i].softirq, stats[i].steal,
+             stats[i].guest, stats[i].guest_nice);
+    }
+    free(stats);
+  }
+}

analyzer.h

@@ -0,0 +1,5 @@
+#ifndef ANALYZER_H
+#define ANALYZER_H
+
+void *analyzer();
+#endif

cputracker.c

@@ -1,7 +1,6 @@
 #include "cputracker.h"
+#include "analyzer.h"
 #include "reader.h"
-#include <stdio.h>
-#include <stdlib.h>
 
 int g_nproc = 0;
 struct proc_stat *g_buffer[BUFFER_SIZE];
@@ -33,6 +32,15 @@ int put_item(struct proc_stat *stats) {
   return 0;
 }
 
+struct proc_stat *remove_item() {
+  int indexToRemove = get_semaphore_value(&g_filledSpaceSemaphore);
+  if (indexToRemove < 0) {
+    return NULL;
+  }
+  struct proc_stat *stats = g_buffer[indexToRemove];
+  return stats;
+}
+
 int main() {
   if (get_nproc(&g_nproc) == -1) {
     exit(EXIT_FAILURE);
@@ -44,6 +52,11 @@ int main() {
   }
 
   g_nproc++;
-  reader();
+  pthread_t readerThreadId;
+  pthread_t analyzerThreadId;
+  pthread_create(&readerThreadId, NULL, reader, NULL);
+  pthread_create(&analyzerThreadId, NULL, analyzer, NULL);
+  pthread_join(readerThreadId, NULL);
+  pthread_join(analyzerThreadId, NULL);
   return 0;
 }

cputracker.h

@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #define BUFFER_SIZE 100
 
@@ -41,4 +42,5 @@ extern sem_t g_leftSpaceSemaphore;
 int get_nproc();
 int get_semaphore_value(sem_t *sem);
 int put_item(struct proc_stat *stats);
+struct proc_stat *remove_item();
 #endif

reader.c

@@ -1,8 +1,5 @@
 #include "reader.h"
 #include "cputracker.h"
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdio.h>
 
 struct proc_stat *get_proc_stats() {
   FILE *file = fopen("/proc/stat", "r");
@@ -28,11 +25,11 @@ struct proc_stat *get_proc_stats() {
   return stats;
 }
 
-void reader() {
+void *reader() {
   struct proc_stat *stats = NULL;
   while (1) {
     if ((stats = get_proc_stats()) == NULL) {
-      return;
+      return NULL;
     }
 
     sem_wait(&g_leftSpaceSemaphore);

reader.h

@@ -1,8 +1,7 @@
 #ifndef READER_H
 #define READER_H
-#include <unistd.h>
 
-void reader();
+void *reader();
 struct proc_stat *get_proc_stats();
 
 #endif