Save nearly working queues.

[wsti_so.git] / src / process1.c

diff --git a/src/process1.c b/src/process1.c
index 41e0ea4729508bc71bcdb70f7cf423ace48942f3..2492ebecfe874f5ed4b4bae357b8e05aa56122f0 100644 (file)
--- a/src/process1.c
+++ b/src/process1.c
@@ -9,6 +9,7 @@
 #include <signal.h>
 
 #include <sys/shm.h>
+#include <sys/msg.h>
 
 
 /** If buffer is too small to hold entire string, it is incremented by this value */
@@ -56,22 +57,54 @@ int qid_output1;
 int qid_output2;
 
 struct queue_message {
-       int signo;
+       long mtype;
+       int signo[1];
 };
 
+void notify_other_processes(int signo) {
+       int i = 0;
+       struct queue_message msg;
+       msg.signo[0] = signo;
+
+       for (; i < 3; i++) {
+               pid_t pid = processes->pids[i];
+               // Bleh
+               if (i != 0 && pid != 0) {
+                       msg.mtype = i+1;
+                       fprintf(stderr, "[%s] Sending message of type (%d) with value %d\n", "process1", msg.mtype, msg.signo[0]);
+                       msgsnd(pid, &msg, sizeof(int), 0);
+                       fprintf(stderr, "[%s] Sending signal %s (%d) to PID: %d\n", "process1", strsignal(SIGUSR1), SIGUSR1, pid);
+                       kill(pid, SIGUSR1);
+               }
+       }
+}
+
 /**
  * Handler for signals.
  */
 void sig_handler(int signo)
 {
        fprintf(stderr, "[%s] Received %s!\n", "process1", strsignal(signo));
+
        if (signo == SIGUSR1) {
-               fprintf(stderr, "[%s] > Notified!\n", "process3");
+               fprintf(stderr, "[%s] > Notified!\n", "process1");
+               struct queue_message msg;
+               /* Check queues from both other processes */
+               if (msgrcv(processes->pids[1], &msg, sizeof(int), 1, 0) > 0) {
+                       fprintf(stderr, "[%s] > Notified with value: %s!\n", "process1", strsignal(msg.signo[0]));
+                       raise(msg.signo[0]);
+                       break;
+               }
+               else if (msgrcv(processes->pids[2], &msg, sizeof(int), 1, 0) > 0) {
+                       fprintf(stderr, "[%s] > Notified with value: %s!\n", "process1", strsignal(msg.signo[0]));
+                       raise(msg.signo[0]);
+                       break;
+               }
        }
        else if (signo == SIGTERM) {
-               int i = 0;
-               struct queue_message msg;
-               msg.signo = signo;
+               fprintf(stderr, "[%s] > Signalling other processes..\n", "process1");
+               processes->pids[1] = 0;
+               notify_other_processes(signo);
 
                fprintf(stderr, "[%s] > Releasing resources\n", "process1");
                close(write_pipe);
@@ -81,15 +114,6 @@ void sig_handler(int signo)
                        free(buffer);
                        buffer = NULL;
                }
-               for (; i < 3; i++) {
-                       pid_t pid = processes->pids[i];
-                       fprintf(stderr, "[%s] Process %d, PID: %d\n", "process3", i, pid);
-                       // Bleh
-                       if (i != 0) {
-                               msgsnd(pid, &msg, sizeof(msg));
-                               kill(pid, SIGUSR1);
-                       }
-               }
                exit(0);
        }
        else if (signo == SIGTSTP) {
@@ -152,7 +176,6 @@ int main(void) {
 
        fprintf(stderr, "[%s] Shared pid: %d\n", "process1", getpid());
 
-       sleep(1);
        /**
         * Register message queue to communicate with other processes
         */