Add tests.py

Author: zielinsky

Makefile

@@ -14,4 +14,9 @@ printer.o: printer.c printer.h cputracker.h
 cputracker.o: cputracker.c reader.h cputracker.h 
 
 format:
-	clang-format --style=file -i *.c *.h
+	clang-format --style=file -i *.c *.h
+
+clean:
+	rm -f *.o
+	
+.PHONY: clean

analyzer.c

@@ -1,5 +1,4 @@
 #include "analyzer.h"
-#include "cputracker.h"
 
 static unsigned long average_cpu_usage(struct proc_stat prev,
                                        struct proc_stat current) {

cputracker.c

@@ -67,7 +67,7 @@ static void watchdog(void) {
     for (int i = 0; i < THREADS; i++) {
       if (working[i] == 0) {
         pthread_mutex_unlock(&watchdogMutex);
-        perror("Error: Thread not responding... Terminating\n");
+        printf("Error: Thread not responding... Terminating\n");
         handler(-1);
         return;
       }
@@ -77,6 +77,12 @@ static void watchdog(void) {
   }
 }
 
+void main_test(void){
+  int nproc;
+  if (get_nproc(&nproc) == 0) {
+    assert(nproc >= 1);
+  }
+}
 
 int main(void) {
   struct sigaction action;

cputracker.h

@@ -51,4 +51,5 @@ extern sem_t g_printLeftSpaceSemaphore;
 unsigned long *get_item_from_print_buffer(void);
 struct proc_stat *get_item_from_data_buffer(void);
 void notify_watchdog(int id);
+void main_test(void);
 #endif

reader.c

@@ -1,10 +1,9 @@
 #include "reader.h"
-#include "cputracker.h"
 
-static int get_proc_stats(struct proc_stat *stats) {
+static int get_proc_stats(struct proc_stat *stats, int threads) {
   FILE *file = fopen("/proc/stat", "r");
   char line[1024];
-  for (int thread = 0; thread < g_nproc; thread++) {
+  for (int thread = 0; thread < threads; thread++) {
     if (fgets(line, sizeof(line), file) == NULL ||
         strncmp(line, "cpu", 3) != 0) {
       fclose(file);
@@ -20,14 +19,21 @@ static int get_proc_stats(struct proc_stat *stats) {
   return 0;
 }
 
+void reader_test(void){
+  struct proc_stat stats;
+  if (get_proc_stats(&stats,1) == 0) {
+    assert(strncmp(stats.name, "cpu", 3) == 0);
+  }
+}
+
 void *reader(void *arg) {
   (void)arg;
   while (1) {
     notify_watchdog(Reader);
     sem_wait(&g_dataLeftSpaceSemaphore);
     pthread_mutex_lock(&g_dataBufferMutex);
 
-    if (get_proc_stats(get_item_from_data_buffer()) == -1) {
+    if (get_proc_stats(get_item_from_data_buffer(), g_nproc) == -1) {
       pthread_mutex_unlock(&g_dataBufferMutex);
       sem_post(&g_dataLeftSpaceSemaphore);
       continue;

reader.h

@@ -5,4 +5,5 @@
 #define READ_DELAY 50000
 
 void *reader(void *arg);
+void reader_test(void);
 #endif

tests.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+
+import subprocess
+import signal
+import time
+
+def sigterm_case():
+    process = subprocess.Popen(["./cputracker"], stdout=subprocess.PIPE)
+    time.sleep(2)
+    # Wysłanie sygnału SIGTERM do procesu
+    process.send_signal(signal.SIGTERM)
+
+    # Oczekiwanie na zakończenie procesu
+    process.wait()
+
+    # Odczytywanie wyjścia programu
+    output = process.stdout.read()
+
+    if b"Error: Thread not responding... Terminating" in output:
+        print("SIGTERM TEST: [OK]")
+    else:
+        print("SIGTERM TEST: [NO]")
+
+def valgrind_case():
+    process = subprocess.Popen(["valgrind --leak-check=full ./cputracker -s"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    time.sleep(6)
+    # Wysłanie sygnału SIGTERM do procesu
+    process.send_signal(signal.SIGTERM)
+
+    # Oczekiwanie na zakończenie procesu
+    process.wait()
+
+    # Odczytywanie wyjścia programu
+    output = process.stderr.read()
+
+    if b"All heap blocks were freed -- no leaks are possible" in output:
+        print("VALGRIND TEST: [OK]")
+    else:
+        print("VALGRIND TEST: [NO]")
+        print(output)
+
+sigterm_case()
+valgrind_case()