X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fprocess1.c;h=fbbfa40c1b2d5f848ea279ce4ce954b106719062;hb=963f77561737c9098d160a4b1d308c71ab0fdef8;hp=41e0ea4729508bc71bcdb70f7cf423ace48942f3;hpb=b1c3c5ca4ac63d8e7f92cc130a75d2322b8a28d8;p=wsti_so.git

diff --git a/src/process1.c b/src/process1.c
index 41e0ea4..fbbfa40 100644
--- 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 */
@@ -49,29 +50,56 @@ 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 {
-	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(qid, &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(qid, &msg, sizeof(int), 1, 0) > 0) {
+			fprintf(stderr, "[%s] > Notified with value: %s!\n", "process1", strsignal(msg.signo[0]));
+			raise(msg.signo[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]);
+		}
 	}
 	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 +109,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,15 +171,10 @@ int main(void) {
 
 	fprintf(stderr, "[%s] Shared pid: %d\n", "process1", getpid());
 
-	sleep(1);
 	/**
 	 * 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);