From 695953440565103964e816e7326c66f3d171c3e0 Mon Sep 17 00:00:00 2001
From: jimi-wzq <wangzhengquan85@gmail.com>
Date: 星期六, 01 八月 2020 10:48:18 +0800
Subject: [PATCH] fix conflict
---
test_socket/dgram_mod_req_rep.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/test_socket/dgram_mod_req_rep.c b/test_socket/dgram_mod_req_rep.c
index 119b497..9ed938b 100644
--- a/test_socket/dgram_mod_req_rep.c
+++ b/test_socket/dgram_mod_req_rep.c
@@ -19,7 +19,7 @@
}Targ;
-LockFreeQueue<task_t, DM_Allocator> task_queue(100);
+LockFreeQueue<task_t, DM_Allocator> task_queue(128);
void *worker(void *socket) {
@@ -44,7 +44,7 @@
}
void server(int port) {
- void *socket = dgram_mod_open_socket(REQ_REP);
+ void *socket = dgram_mod_open_socket();
dgram_mod_bind(socket, port);
initThreadPool(socket);
@@ -58,7 +58,7 @@
}
void client(int port) {
- void *socket = dgram_mod_open_socket(REQ_REP);
+ void *socket = dgram_mod_open_socket();
int size;
void *recvbuf;
char sendbuf[512];
@@ -80,10 +80,10 @@
char sendbuf[512];
int scale = 100000;
int i;
- void *socket = dgram_mod_open_socket(REQ_REP);
+ void *socket = dgram_mod_open_socket();
char filename[512];
- sprintf(filename, "test%d.txt", targ->id);
+ sprintf(filename, "test%d.tmp", targ->id);
FILE *fp = NULL;
fp = fopen(filename, "w+");
--
Gitblit v1.8.0