code cleaning

Author: zielinsky

cputracker.c

@@ -11,7 +11,6 @@ sem_t g_leftSpaceSemaphore;
 int get_nproc(int *nproc) {
   *nproc = sysconf(_SC_NPROCESSORS_ONLN);
   if (*nproc == -1) {
-    perror("Reading number of threads failed");
     return -1;
   }
   return 0;
@@ -25,16 +24,15 @@ int get_semaphore_value(sem_t *sem) {
 
 struct proc_stat *get_item() {
   int index = get_semaphore_value(&g_filledSpaceSemaphore);
-  // if (index > BUFFER_SIZE) {
-  //   return NULL;
-  // }
   return g_buffer[index];
 }
 
 int main() {
   if (get_nproc(&g_nproc) == -1) {
     exit(EXIT_FAILURE);
   }
+  g_nproc++;
+
   for (int i = 0; i < BUFFER_SIZE; i++) {
     g_buffer[i] = malloc(g_nproc * sizeof(struct proc_stat));
     if (g_buffer[i] == NULL) {
@@ -47,12 +45,18 @@ int main() {
     exit(EXIT_FAILURE);
   }
 
-  g_nproc++;
   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);
+
+  pthread_mutex_destroy(&g_bufferMutex);
+  sem_destroy(&g_filledSpaceSemaphore);
+  sem_destroy(&g_leftSpaceSemaphore);
+  for (int i = 0; i < BUFFER_SIZE; i++) {
+    free(g_buffer[i]);
+  }
   return 0;
 }

reader.c

@@ -29,10 +29,8 @@ void *reader() {
     pthread_mutex_lock(&g_bufferMutex);
 
     struct proc_stat *stats = get_item();
-    if (stats == NULL) {
-      continue;
-    }
     if (get_proc_stats(stats) == -1) {
+      pthread_mutex_unlock(&g_bufferMutex);
       continue;
     }