feat(scheduler): fixed some bugs

code/minHeap.c

@@ -42,8 +42,8 @@ void insertMinHeap(min_heap **heap, void *element) {
  */
 void *extractMin(min_heap *heap) {
   // if(DEBUG){
-  printf("entered extraction!!\n");
-  printHeap(heap);
+  // printf("entered extraction!!\n");
+  // printHeap(heap);
   // }
 
   void *minElement = heap->arr[0];
@@ -55,6 +55,15 @@ void *extractMin(min_heap *heap) {
   return minElement;
 }
 
+/**
+ * get the min element in the heap
+ */
+void *getMin(min_heap *heap) {
+  if (!heap || heap->size <= 0)
+    return NULL;
+  return heap->arr[0];
+}
+
 /**
  * Shift-up operation, called on decreasing the priority value
  */
@@ -119,7 +128,7 @@ min_heap **doubleCapacity(min_heap *heap) {
   min_heap **returnval = &newHeap;
 
   // if(DEBUG){
-  // printf("doubling occured!!\n");
+  // printf("doubling occurred!!\n");
   // printHeap(*returnval);
   // }
 

code/minHeapTest.c

@@ -1,4 +1,5 @@
 #include "minHeap.h"
+#include <stdio.h>
 
 int compare(void* a , void* b){
 

code/process_generator.c

@@ -9,7 +9,6 @@
 
 #include "process_generator.h"
 #include "headers.h"
-#include <math.h>
 #include <string.h>
 
 /**
@@ -317,12 +316,13 @@ void sendProcessesToScheduler(queue *processes, int msgQID) {
                        "priority: %d to scheduler\n" ANSI_RESET,
            process->id, process->AT, process->BT, process->priority);
     // TODO: check this initial values later
-    // process->RT = process->BT;    //this is set inside the scheduler (shmAdd)
     process->WT = 0;
     process->TA = 0;
     process->LST = currentTime;
     process->ST = -1;
     process->FT = -1;
+    process->state = READY;
+    process->pid = 1;
 
     response = msgsnd(msgQID, process, sizeof(process_t), !IPC_NOWAIT);
     if (response == -1) {

code/processes.txt

@@ -1,4 +1,4 @@
 #id arrival runtime priority
-1	2	4	1
-2	7	5	1
-3	15	6	1
+1	2	20	1
+2	5	10	1
+3	9	15	1

code/queue.c

@@ -52,11 +52,15 @@ void push(queue *q, void *item) {
  * remove the first element from the queue
  * @q: pointer to queue
  */
-void pop(queue *q) {
+void *pop(queue *q) {
+  d_node *n;
+
   if (empty(q))
-    return;
+    return NULL;
 
+  n = getNode(q->list, 0);
   deleteNodeStart(q->list);
+  return n->data;
 }
 
 /**

code/queue.h

@@ -11,7 +11,7 @@ queue *createQueue(void (*free_func)(void *));
 int empty(queue *q);
 size_t size(queue *q);
 void push(queue *q, void *item);
-void pop(queue *q);
+void *pop(queue *q);
 void *front(queue *q);
 void *back(queue *q);
 void destroyQueue(queue *q);