Add message queue & Update

uoo723 · Jun 23, 2017 · d9194f1 · d9194f1
1 parent e929248
commit d9194f1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 12 deletions.
diff --git a/include/msg.h b/include/msg.h
@@ -2,7 +2,8 @@
 #define MSGTYPE_H
 
 #define VALUESIZE 100
-#define KEYID ftok(".", 'P')
+#define SERVER_KEYID ftok(".", 'S')
+#define CLIENT_KEYID ftok(",", 'C')
 
 #define TYPE_SERVER 1
 #define TYPE_CLIENT 2

diff --git a/src/client.c b/src/client.c
@@ -19,10 +19,16 @@ static void menu_quit();
 
 static void snd_msg();
 
-static key_t key_id;
+static key_t server_key_id;
+static key_t client_key_id;
 
 void client() {
-    if ((key_id = msgget(KEYID, IPC_CREAT|0666)) < 0) {
+    if ((server_key_id = msgget(SERVER_KEYID, IPC_CREAT|0666)) < 0) {
+        perror("msgget error in client ");
+        exit(0);
+    }
+
+    if ((client_key_id = msgget(CLIENT_KEYID, IPC_CREAT|0666)) < 0) {
         perror("msgget error in client ");
         exit(0);
     }
@@ -50,7 +56,7 @@ void req_get(unsigned int key) {
     msg.key = key;
     snd_msg(&msg);
 
-    if (msgrcv(key_id, &msg, MSGSIZE, TYPE_CLIENT, 0) < 0) {
+    if (msgrcv(client_key_id, &msg, MSGSIZE, 0, 0) < 0) {
         perror("msgrcv error in client ");
         return;
     }
@@ -75,7 +81,7 @@ void req_quit() {
 }
 
 static void snd_msg(msgbuf_t *msg) {
-    if (msgsnd(key_id, msg, MSGSIZE, 0) < 0) {
+    if (msgsnd(server_key_id, msg, MSGSIZE, 0) < 0) {
         perror("msgsnd error in client ");
         return;
     }

diff --git a/src/server.c b/src/server.c
@@ -25,7 +25,8 @@ typedef struct {
     char value[VALUESIZE];
 } args_t;
 
-static key_t key_id;
+static key_t server_key_id;
+static key_t client_key_id;
 
 static hashtable_t *hashtable;
 static threadpool_t thpool;
@@ -37,17 +38,25 @@ static void rcv_get_internal(void *);
 static void rcv_remove_internal(void *);
 
 static void int_handler(int signo) {
-    msgctl(key_id, IPC_RMID, 0);
+    msgctl(server_key_id, IPC_RMID, 0);
+    msgctl(client_key_id, IPC_RMID, 0);
 }
 
+static int count;
+
 void server() {
 	signal(SIGINT, int_handler);
 
-	if ((key_id = msgget(KEYID, IPC_CREAT|0666)) < 0) {
+	if ((server_key_id = msgget(SERVER_KEYID, IPC_CREAT|0666)) < 0) {
 		perror("msgget error in client ");
 		exit(0);
 	}
 
+    if ((client_key_id = msgget(CLIENT_KEYID, IPC_CREAT|0666)) < 0) {
+        perror("msgget error in client ");
+		exit(0);
+    }
+
 	if ((hashtable = ht_create(1000000)) == NULL) {
 		perror("hashtable is null ");
 		exit(0);
@@ -67,11 +76,12 @@ void server() {
     msgbuf_t msg;
 
 	while (1) {
-		if (msgrcv(key_id, &msg, MSGSIZE, TYPE_SERVER, 0) < 0) {
+		if (msgrcv(server_key_id, &msg, MSGSIZE, 0, 0) < 0) {
 			perror("msgrcv error in server ");
 			return;
 		}
 
+        // printf("msgrcv %d\n", count++);
 		switch (msg.type) {
 			case TYPE_REQ_PUT:
 
@@ -175,7 +185,7 @@ void rcv_get(unsigned int key) {
 	msg.mtype = TYPE_CLIENT;
 	msg.type = TYPE_RES_GET;
     msg.key = key;
-	if (msgsnd(key_id, &msg, MSGSIZE, 0) < 0) {
+	if (msgsnd(client_key_id, &msg, MSGSIZE, 0) < 0) {
 		perror("msgsnd error in server ");
 		return;
 	}

diff --git a/test/client_test.c b/test/client_test.c
@@ -1,5 +1,7 @@
 #define MAX_CONTENTS 100000
-#define MAX_OPERATION 500000
+#define MAX_OPERATION 1000000
+
+#define THREAD 100
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,7 +40,7 @@ static time_t end_time;
 void client_test() {
     printf("client_test!!\n");
 
-    if ((thpool = thpool_init(4)) == NULL) {
+    if ((thpool = thpool_init(THREAD)) == NULL) {
         perror("thpool is null ");
         exit(0);
     }