Change MakeFile

Add header files
Add main file

Author: zielinsky

.gitignore

@@ -4,3 +4,5 @@ a.out
 .vscode/settings.json
 reader
 reader.o
+cputracker.o
+cputracker

Makefile

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

cputracker.c

@@ -0,0 +1,11 @@
+#include "cputracker.h"
+#include "reader.h"
+
+int nproc = 0;
+
+int main(){
+    nproc = get_nproc() + 1;
+
+    print_stats();
+    return 0;
+}

cputracker.h

@@ -0,0 +1,33 @@
+#ifndef CPUTRACKER_H
+#define CPUTRACKER_H 
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define EXIT_FAILURE 1
+#define EXIT_SUCCESS 0
+
+
+extern int nproc;
+
+struct proc_stat {
+  char name[256];
+  unsigned long user, // Time spent with normal processing in user mode.
+      nice,           // Time spent with niced processes in user mode.
+      system,         // Time spent running in kernel mode.
+      idle,           // Time spent in vacations twiddling thumbs.
+      iowait,     // Time spent waiting for I/O to completed. This is considered
+                  // idle time too.
+      irq,        // Time spent serving hardware interrupts.
+      softirq,    // Time spent serving software interrupts.
+      steal,      // Time stolen by other operating systems running in a virtual
+                  // environment.
+      guest,      // Time spent for running a virtual CPU or guest OS under the
+                  // control of the kernel.
+      guest_nice; // Time spent running a niced guest (virtual CPU for guest
+                  // operating systems under the control of the Linux kernel).
+};
+
+#endif

reader.c

@@ -1,8 +1,5 @@
 #include "reader.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
+#include "cputracker.h"
 
 int get_nproc() {
   FILE *fp;
@@ -11,7 +8,7 @@ int get_nproc() {
   fp = popen("nproc", "r");
   if (fp == NULL) {
     printf("Reading number of threads failed\n");
-    exit(1);
+    exit(EXIT_FAILURE);
   }
 
   int nproc = 0;
@@ -23,21 +20,29 @@ int get_nproc() {
   return nproc;
 }
 
-int main() {
+struct proc_stat *get_proc_stats() {
   FILE *file = fopen("/proc/stat", "r");
   char line[1024];
-  int nproc = get_nproc() + 1;
-  struct proc_stat stats[nproc];
+  struct proc_stat *stats = malloc(nproc * sizeof(struct proc_stat));
 
   for (int thread = 0; thread < nproc; thread++) {
     fgets(line, sizeof(line), file);
-    assert(strncmp(line, "cpu", 3) == 0);
+    // assert(strncmp(line, "cpu", 3) == 0);
+    if (strncmp(line, "cpu", 3) != 0) {
+      printf("Reading thread info failed\n");
+      exit(EXIT_FAILURE);
+    }
     sscanf(line, "%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu",
            stats[thread].name, &stats[thread].user, &stats[thread].nice,
            &stats[thread].system, &stats[thread].idle, &stats[thread].iowait,
            &stats[thread].irq, &stats[thread].softirq, &stats[thread].steal,
            &stats[thread].guest, &stats[thread].guest_nice);
   }
+  return stats;
+}
+
+int print_stats() {
+  struct proc_stat *stats = get_proc_stats();
 
   for (int i = 0; i < nproc; i++) {
     printf("%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu\n", stats[i].name,
@@ -46,6 +51,6 @@ int main() {
            stats[i].guest, stats[i].guest_nice);
   }
 
-  fclose(file);
+  free(stats);
   return 0;
 }

reader.h

@@ -1,17 +1,9 @@
-struct proc_stat {
-  char name[256];
-  unsigned long user, // Time spent with normal processing in user mode.
-      nice,           // Time spent with niced processes in user mode.
-      system,         // Time spent running in kernel mode.
-      idle,           // Time spent in vacations twiddling thumbs.
-      iowait,     // Time spent waiting for I/O to completed. This is considered
-                  // idle time too.
-      irq,        // Time spent serving hardware interrupts.
-      softirq,    // Time spent serving software interrupts.
-      steal,      // Time stolen by other operating systems running in a virtual
-                  // environment.
-      guest,      // Time spent for running a virtual CPU or guest OS under the
-                  // control of the kernel.
-      guest_nice; // Time spent running a niced guest (virtual CPU for guest
-                  // operating systems under the control of the Linux kernel).
-};
+#ifndef READER_H
+#define READER_H 
+
+
+int print_stats();
+struct proc_stat *get_proc_stats();
+int get_nproc();
+
+#endif