Using only one message queue.

[wsti_so.git] / src / process1.c

diff --git a/src/process1.c b/src/process1.c
index 2492ebecfe874f5ed4b4bae357b8e05aa56122f0..fbbfa40c1b2d5f848ea279ce4ce954b106719062 100644 (file)
--- a/src/process1.c
+++ b/src/process1.c
@@ -50,11 +50,8 @@ struct message * processes = NULL;
 /**
  * Message queue variables
  */
-key_t qkey;
-int qid_input;
-
-int qid_output1;
-int qid_output2;
+key_t qkey = 12356;
+int qid;
 
 struct queue_message {
        long mtype;
@@ -72,7 +69,7 @@ void notify_other_processes(int signo) {
                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);
+                       msgsnd(qid, &msg, sizeof(int), 0);
                        fprintf(stderr, "[%s] Sending signal %s (%d) to PID: %d\n", "process1", strsignal(SIGUSR1), SIGUSR1, pid);
                        kill(pid, SIGUSR1);
                }
@@ -90,15 +87,13 @@ void sig_handler(int signo)
                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) {
+               if (msgrcv(qid, &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) {
+               else if (msgrcv(qid, &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) {
@@ -179,11 +174,7 @@ int main(void) {
        /**
         * Register message queue to communicate with other processes
         */
-       qkey = getpid();
-       qid_input = msgget(qkey, IPC_CREAT | 0666);
-       
-       qid_output1 = msgget(processes->pids[1], IPC_CREAT | 0666);
-       qid_output2 = msgget(processes->pids[2], IPC_CREAT | 0666);
+       qid = msgget(qkey, IPC_CREAT | 0666);
        
        mkfifo(write_pipe, 0666);