Commit: c1b4f4a00f8a386d61097aafc96e21c207ca9bc0 - ogatool (git)

oga's tools

Commit MetaInfo

• Révision: c1b4f4a00f8a386d61097aafc96e21c207ca9bc0 (tree)
• l'heure: 2016-01-19 06:13:09
• Auteur: oga <hyperoga@gmai...>
• Commiter: oga

Message de Log

sutdown socket

Change Summary

• modified: netpf_send.c

Modification

--- a/netpf_send.c
+++ b/netpf_send.c
@@ -72,10 +72,10 @@ char *b[];
 
 	for (i = 1; i<a; i++) {
 	    if (!strncmp(b[i],"-h",2)) {
-		printf("usage : netpf_send { -s | <hostname> } [-p <port(%d)>] [-c <send_size(KB)>\n", port);
+		printf("usage : netpf_send { -s | <hostname> } [-p <port(%d)>] [-c <send_size(MB)>\n", port);
 		printf("          -s        : start as netpf server\n");
 		printf("          hostnames : netpf server name.(start as netpf client)\n");
-		printf("          -c size   : test data size(MB) default:%dMB\n", SEND_SIZE);
+		printf("          -c size   : test data size(MB) default:%dMB\n", SEND_SIZE/1024/1024);
 		printf("          -p port   : test port\n");
 		exit(1);
 	    }
@@ -184,6 +184,7 @@ char *b[];
 	                //PUT_DATA(newsockfd, buf, SEND_SIZE);
 	            }
 	            printf("chile pid=%d exit!\n",getpid());
+				shutdown (newsockfd, SHUT_RDWR);
 	            close(newsockfd);
 #ifndef DOS
 	            exit(0);
@@ -242,7 +243,7 @@ char *b[];
                 //printf("## recv %d MB start\n",SEND_SIZE/1024/1024);
                 //GET_DATA(sockfd, buf, SEND_SIZE);
             }
-			//shutdown (sockfd, SHUT_RDWR);
+			shutdown (sockfd, SHUT_RDWR);
             close(sockfd);
 
         }
@@ -281,10 +282,10 @@ void PUT_DATA(int sockfd, char *buf, int sz)
 	if (diff <0 ) diff = -diff;
 	dprintf("Send   end usec : %u\n",wk2);
 	dprintf("      diff usec : %u\n",diff);
-	printf("Send Size = %d  time = %.6fsec  perf = %dKB/sec\n",
+	printf("Send Size = %d  time = %.3fsec  perf = %.3MB/sec\n",
 			all,
 			(float)diff/1000000,
-			(diff/1000 == 0)?999999:all/(diff/1000)); /* V1.02-C */
+			(diff/1000 == 0)?999999:(float)all/diff); /* V1.02-C */
 }
 
 /* 
@@ -323,10 +324,10 @@ void GET_DATA(int sockfd, char *buf, int sz)
 	if (diff <0 ) diff = -diff;
 	dprintf("Recv   end usec : %u\n",wk2);
 	dprintf("      diff usec : %u\n",diff);
-	printf("Recv Size = %d  time = %.6fsec  perf = %dKB/sec\n",
+	printf("Recv Size = %d  time = %.3fsec  perf = %.3fMB/sec\n",
 			all,
 			(float)diff/1000000,
-			all/(diff/1000));
+			(float)all/diff);
 }
 
 void reapchild()