single epoll

Author: wangbojing

server_mulport_epoll.c

@@ -1,9 +1,4 @@
 
-/*
- * author : wangbojing
- * email  : [email protected] 
- * 测试操作系统的并发量
- */
 
 
 #include <stdio.h>
@@ -363,7 +358,6 @@ static int nSend(int sockfd, const void *buffer, int length, int flags) {
 
 static int curfds = 1;
 static int nRun = 0;
-int sockfds[MAX_PORT] = {0};
 
 
 void client_job(job_t *job) {
@@ -428,21 +422,59 @@ int listenfd(int fd, int *fds) {
 	return 0;
 }
 
-struct timeval tv_begin;
-struct timeval tv_cur;
-
-void *listen_thread(void *arg) {
-
+int main(void) {
 	int i = 0;
-	int epoll_fd = *(int *)arg;
-	struct epoll_event events[MAX_EPOLLSIZE];
+	int sockfds[MAX_PORT] = {0};
 
+	printf("C1000K Server Start\n");
 
+	threadpool_init(); //
+
+	int epoll_fd = epoll_create(MAX_EPOLLSIZE); 
+
+	for (i = 0;i < MAX_PORT;i ++) {
+
+		int sockfd = socket(AF_INET, SOCK_STREAM, 0);
+		if (sockfd < 0) {
+			perror("socket");
+			return 1;
+		}
+
+		struct sockaddr_in addr;
+		memset(&addr, 0, sizeof(struct sockaddr_in));
+		
+		addr.sin_family = AF_INET;
+		addr.sin_port = htons(SERVER_PORT+i);
+		addr.sin_addr.s_addr = INADDR_ANY;
+
+		if (bind(sockfd, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)) < 0) {
+			perror("bind");
+			return 2;
+		}
+
+		if (listen(sockfd, 5) < 0) {
+			perror("listen");
+			return 3;
+		}
+
+		sockfds[i] = sockfd;
+		printf("C1000K Server Listen on Port:%d\n", SERVER_PORT+i);
+
+		struct epoll_event ev;
+		 
+		ev.events = EPOLLIN | EPOLLET; //EPOLLLT
+		ev.data.fd = sockfd;
+		epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sockfd, &ev);  
+	}
+
+	struct timeval tv_begin;
 	gettimeofday(&tv_begin, NULL);
+	
+	struct epoll_event events[MAX_EPOLLSIZE];
 
 	while (1) {
 
-		int nfds = epoll_wait(epoll_fd, events, curfds, 5);  
+		int nfds = epoll_wait(epoll_fd, events, curfds, 5);  //是不是秘书给累死。
 		if (nfds == -1) {
 			perror("epoll_wait");
 			break;
@@ -458,7 +490,7 @@ void *listen_thread(void *arg) {
 				int clientfd = accept(sockfd, (struct sockaddr*)&client_addr, &client_len);
 				if (clientfd < 0) {
 					perror("accept");
-					return NULL;
+					return 4;
 				}
 
 				if (curfds ++ > 1000 * 1000) {
@@ -474,12 +506,12 @@ void *listen_thread(void *arg) {
 				}
 #else
 				if (curfds % 1000 == 999) {
-					
+					struct timeval tv_cur;
 					memcpy(&tv_cur, &tv_begin, sizeof(struct timeval));
-			
+					
 					gettimeofday(&tv_begin, NULL);
+
 					int time_used = TIME_SUB_MS(tv_begin, tv_cur);
-					
 					printf("connections: %d, sockfd:%d, time_used:%d\n", curfds, clientfd, time_used);
 				}
 #endif
@@ -494,7 +526,7 @@ void *listen_thread(void *arg) {
 			} else {
 
 				int clientfd = events[i].data.fd;
-#if 1
+#if 0
 				if (nRun) {
 					printf(" New Data is Comming\n");
 					client_data_process(clientfd);
@@ -513,79 +545,12 @@ void *listen_thread(void *arg) {
 				}
 #else
 				client_data_process(clientfd);
+				
 #endif
 			}
 		}
 
 	}
-	
-}
-
-int main(void) {
-	int i = 0;
-
-	printf("C1000K Server Start\n");
-	
-	threadpool_init(); //
-
-
-#if 0
-	int epoll_fd = epoll_create(MAX_EPOLLSIZE); 
-#else
-
-	int epoll_fds[CPU_CORES_SIZE] = {0};
-	pthread_t thread_id[CPU_CORES_SIZE] = {0};
-
-	for (i = 0;i < CPU_CORES_SIZE;i ++) {
-		epoll_fds[i] = epoll_create(MAX_EPOLLSIZE);
-
-		pthread_create(&thread_id[i], NULL, listen_thread, &epoll_fds[i]);
-	}
-
-
-#endif
-	for (i = 0;i < MAX_PORT;i ++) {
-
-		int sockfd = socket(AF_INET, SOCK_STREAM, 0);
-		if (sockfd < 0) {
-			perror("socket");
-			return 1;
-		}
-
-		struct sockaddr_in addr;
-		memset(&addr, 0, sizeof(struct sockaddr_in));
-		
-		addr.sin_family = AF_INET;
-		addr.sin_port = htons(SERVER_PORT+i);
-		addr.sin_addr.s_addr = INADDR_ANY;
-
-		if (bind(sockfd, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)) < 0) {
-			perror("bind");
-			return 2;
-		}
-
-		if (listen(sockfd, 5) < 0) {
-			perror("listen");
-			return 3;
-		}
-
-		sockfds[i] = sockfd;
-		printf("C1000K Server Listen on Port:%d\n", SERVER_PORT+i);
-
-		struct epoll_event ev;
-		 
-		ev.events = EPOLLIN | EPOLLET; //EPOLLLT
-		ev.data.fd = sockfd;
-		epoll_ctl(epoll_fds[i%CPU_CORES_SIZE], EPOLL_CTL_ADD, sockfd, &ev);  
-	}
-
-	for (i = 0;i < CPU_CORES_SIZE;i ++) {
-		pthread_join(thread_id[i], NULL);
-	}
-
-
-	getchar();
-	printf("end\n");
 }