(file) Return to wsock32_main.c CVS log (file) (dir) Up to [RizwankCVS] / wine4 / wine / dlls / wsock32 / tests

Diff for /wine4/wine/dlls/wsock32/tests/wsock32_main.c between version 1.18 and 1.21

version 1.18, 2005/02/23 04:43:40 version 1.21, 2005/02/23 06:13:50
Line 43 
Line 43 
 #define todo_wine #define todo_wine
 #endif #endif
  
 #define NUM_CLIENTS 3  // clients threads to create
   #define NUM_CLIENTS 1500
   
 // amount of data to transfer from each client to server // amount of data to transfer from each client to server
 #define TEST_DATA_SIZE 14554  #define TEST_DATA_SIZE 145243
   
   // tracks number of clients that have successfull transferred data
   volatile int clientsDone = 0;
  
 int clientsDone = 0;  // we often pass this size by reference
 int sizeofSOCKADDR_IN = sizeof(SOCKADDR_IN); int sizeofSOCKADDR_IN = sizeof(SOCKADDR_IN);
   
   // global test data; server sends it to client, then client verifies it
 char *testData; char *testData;
  
 struct TestParams { struct TestParams {
Line 63 
Line 70 
         int clientNum; // 1...NUM_CLIENTS         int clientNum; // 1...NUM_CLIENTS
 }; };
  
 struct Thread {  struct MyThread {
         HANDLE Handle;         HANDLE Handle;
         DWORD ID;         DWORD ID;
 }; };
Line 75 
Line 82 
         SOCKADDR_IN Client; // client info         SOCKADDR_IN Client; // client info
 }; };
  
 extern int close(int);  
   
 static void test_Startup(void); static void test_Startup(void);
 void BlockingClient(int *serverPort);  void BlockingClient(volatile int *serverPort);
 void BlockingServer(int *port);  void BlockingServer(volatile int *port);
 static void test_ClientServerBlocking_1(void); static void test_ClientServerBlocking_1(void);
 static void test_Startup(void); static void test_Startup(void);
  
Line 88 
Line 93 
 { {
         SOCKADDR_IN tmpAddr;         SOCKADDR_IN tmpAddr;
         int tmpAddrSize;         int tmpAddrSize;
           int bindOK;
  
           // create socket
         *sock = socket(AF_INET, type, 0);         *sock = socket(AF_INET, type, 0);
           ok( *sock != INVALID_SOCKET , "Error in socket()");
         if (*sock == INVALID_SOCKET) {         if (*sock == INVALID_SOCKET) {
                 ok( 0 , "Error in socket()");  
                 WSACleanup();                 WSACleanup();
                 exit(0);                 exit(0);
         }         }
         trace("socket() ok\n");  
  
         addr->sin_family = AF_INET;         addr->sin_family = AF_INET;
         addr->sin_addr.s_addr = INADDR_ANY;         addr->sin_addr.s_addr = INADDR_ANY;
         addr->sin_port = htons(0);         addr->sin_port = htons(0);
  
         if( bind(*sock, (const SOCKADDR *) addr, sizeof(*addr)) ) {          // bind socket to port
                 ok( 0 , "Error binding client to socket");          bindOK = !bind(*sock, (const SOCKADDR *) addr, sizeof(*addr));
           ok( bindOK , "Error binding client to socket");
           if( !bindOK ) {
                 WSACleanup();                 WSACleanup();
                 exit(0);                 exit(0);
         }         }
Line 113 
Line 121 
         addr->sin_port = tmpAddr.sin_port;         addr->sin_port = tmpAddr.sin_port;
 } }
  
 void BlockingClient(int *serverPort)  void BlockingClient(volatile int *serverPort)
 { {
         SOCKET sock;         SOCKET sock;
         SOCKADDR_IN client, server;         SOCKADDR_IN client, server;
Line 122 
Line 130 
         int totCharsReceived = 0;         int totCharsReceived = 0;
         int numCharsReceived;         int numCharsReceived;
         int memSame;         int memSame;
           int yieldCounter = 0;
         char buf[1001];         char buf[1001];
  
         StartNetworkApp(SOCK_STREAM, &sock, &client);         StartNetworkApp(SOCK_STREAM, &sock, &client);
  
           //trace("client port %d\n",ntohs(client.sin_port));
   
         hp = gethostbyname("localhost");         hp = gethostbyname("localhost");
  
           // yield until server determines its random port number
         while(*serverPort == 0)         while(*serverPort == 0)
                 ;                  SwitchToThread();
  
         // network code here  
         server.sin_family = AF_INET;         server.sin_family = AF_INET;
         server.sin_addr = *(struct in_addr *) hp->h_addr;         server.sin_addr = *(struct in_addr *) hp->h_addr;
         server.sin_port = *serverPort;         server.sin_port = *serverPort;
  
           // connect to server
         connectError = connect(sock, (struct sockaddr *)&server, sizeof(struct sockaddr));         connectError = connect(sock, (struct sockaddr *)&server, sizeof(struct sockaddr));
         ok( !connectError , "client cannot connect to host\n");         ok( !connectError , "client cannot connect to host\n");
         if(connectError) {         if(connectError) {
                 WSACleanup();                 WSACleanup();
                 exit(0);                 exit(0);
         }         }
         printf("client starting data transfer\n");  
           // start receiving data from server
         while( totCharsReceived < TEST_DATA_SIZE ) {         while( totCharsReceived < TEST_DATA_SIZE ) {
                 numCharsReceived = recv(sock, buf, 1000, 0);                 numCharsReceived = recv(sock, buf, 1000, 0);
                 ok( numCharsReceived > 0, "socket was closed unexpectedly" );                 ok( numCharsReceived > 0, "socket was closed unexpectedly" );
  
                   // check received data againt global test data
                 memSame = ! memcmp(buf,testData+totCharsReceived,numCharsReceived);                 memSame = ! memcmp(buf,testData+totCharsReceived,numCharsReceived);
   
                 if(!memSame) {  
                         printf("\n%d chars received\ncompared %d chars\n",totCharsReceived,numCharsReceived);  
                 }  
   
                 ok( memSame, "data integrity lost during transfer" );                 ok( memSame, "data integrity lost during transfer" );
   
   
                 totCharsReceived += numCharsReceived;                 totCharsReceived += numCharsReceived;
                 //printf("received %d chars\n", numCharsReceived);  
                   // yield to our other threads
                   if(yieldCounter % 20 == 0) {
                           //SwitchToThread();
                   }
                   yieldCounter++;
         }         }
         printf("client data transfer completed\n");  
  
         trace("blocking client done\n");          trace("client done\n");
         clientsDone++;         clientsDone++;
 } }
  
Line 171 
Line 182 
         int bClosed;         int bClosed;
         int totCharsSent = 0;         int totCharsSent = 0;
         int numCharsSent;         int numCharsSent;
           int yieldCounter = 0;
         const int charsPerSend = 2000;         const int charsPerSend = 2000;
  
         printf("server starting data transfer\n");          // loop and send data
         while( totCharsSent < TEST_DATA_SIZE ) {         while( totCharsSent < TEST_DATA_SIZE ) {
                 numCharsSent = send(t->ConnectedSocket, testData+totCharsSent, (totCharsSent + charsPerSend <= TEST_DATA_SIZE) ? charsPerSend : TEST_DATA_SIZE - totCharsSent, 0);                 numCharsSent = send(t->ConnectedSocket, testData+totCharsSent, (totCharsSent + charsPerSend <= TEST_DATA_SIZE) ? charsPerSend : TEST_DATA_SIZE - totCharsSent, 0);
                 //ok( numCharsSent != SOCKET_ERROR, "socket error" );                  ok( numCharsSent != SOCKET_ERROR, "socket error" );
                 if(numCharsSent == SOCKET_ERROR) {                 if(numCharsSent == SOCKET_ERROR) {
                         printf("error code: %d",WSAGetLastError());                         printf("error code: %d",WSAGetLastError());
                 }                 }
                 totCharsSent += numCharsSent;                 totCharsSent += numCharsSent;
                 //printf("sent %d block\n", numCharsSent);  
                   // yield to our other threads
                   if(yieldCounter % 20 == 0) {
                           //SwitchToThread();
                   }
                   yieldCounter++;
         }         }
         printf("server data transfer completed\n");  
  
         bClosed = close(t->ConnectedSocket);          bClosed = !closesocket(t->ConnectedSocket);
         //ok(bClosed,"Error closing socket");          ok(bClosed,"Error closing socket");
 } }
  
 void BlockingServer(int *port) // listens for incoming connections and accepts up to NUM_CLIENTS connections at once  void BlockingServer(volatile int *port) // listens for incoming connections and accepts up to NUM_CLIENTS connections at once
 { {
         struct ServerThread *Threads;         struct ServerThread *Threads;
         int ThreadIndex = 0;         int ThreadIndex = 0;
Line 200 
Line 216 
  
         StartNetworkApp(SOCK_STREAM, &sock, &server);         StartNetworkApp(SOCK_STREAM, &sock, &server);
  
           // allocate enough space to keep track of NUM_CLIENTS connections
         Threads = malloc(sizeof(struct ServerThread) * NUM_CLIENTS);         Threads = malloc(sizeof(struct ServerThread) * NUM_CLIENTS);
         memset(Threads, 0, sizeof(struct ServerThread) * NUM_CLIENTS);         memset(Threads, 0, sizeof(struct ServerThread) * NUM_CLIENTS);
  
           // listen on port
         ListenReturn = listen(sock, NUM_CLIENTS);         ListenReturn = listen(sock, NUM_CLIENTS);
         ok(ListenReturn != SOCKET_ERROR, "error listening on socket");         ok(ListenReturn != SOCKET_ERROR, "error listening on socket");
  
           // set the port parameter; clients now know we're ready to accept connections
         *port = server.sin_port;         *port = server.sin_port;
  
           // we require one connection from each client thread
         for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {         for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {
                         printf("server waiting for connection %d\n", ThreadIndex+1);                          // accept connection
                         Threads[ThreadIndex].ConnectedSocket = accept(sock, (SOCKADDR *) &Threads[ThreadIndex].Client, &sizeofSOCKADDR_IN); // this can be modified to include the address of the remote socket                         Threads[ThreadIndex].ConnectedSocket = accept(sock, (SOCKADDR *) &Threads[ThreadIndex].Client, &sizeofSOCKADDR_IN); // this can be modified to include the address of the remote socket
                         ok(Threads[ThreadIndex].ConnectedSocket != INVALID_SOCKET, "error accepting socket");                         ok(Threads[ThreadIndex].ConnectedSocket != INVALID_SOCKET, "error accepting socket");
                         printf("server accepted connection %d\n", ThreadIndex + 1);  
                           // spawn thread to handle sending data
                         Threads[ThreadIndex].ServerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &Threads[ThreadIndex], 0, &Threads[ThreadIndex].ServerThreadID);                         Threads[ThreadIndex].ServerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &Threads[ThreadIndex], 0, &Threads[ThreadIndex].ServerThreadID);
         }         }
  
         // network code here          // wait for all clients to receive data before cleaning up
   
         while (clientsDone != NUM_CLIENTS)         while (clientsDone != NUM_CLIENTS)
                 ;                  SwitchToThread();
  
         free(Threads);         free(Threads);
         trace("blocking server done\n");  
 } }
  
 static void test_ClientServerBlocking_1(void) static void test_ClientServerBlocking_1(void)
 { {
         int ThreadIndex = 0;         int ThreadIndex = 0;
         int serverPort = 0; // I think the server port would work better as a #DEFINE rather than a variable that gets passed around everywhere          // tell the compiler not to optimize code relating to serverPort
         struct Thread ServerThread;          volatile int serverPort = 0;
         struct Thread *ClientThreads;          struct MyThread ServerThread;
           struct MyThread *ClientThreads;
  
         ClientThreads = malloc(sizeof(struct Thread) * NUM_CLIENTS);          ClientThreads = malloc(sizeof(struct MyThread) * NUM_CLIENTS);
         memset(ClientThreads, 0, sizeof(struct Thread) * NUM_CLIENTS);          memset(ClientThreads, 0, sizeof(struct MyThread) * NUM_CLIENTS);
  
         ClientThreads[ThreadIndex].Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, &serverPort, 0, &ClientThreads[ThreadIndex].ID);          trace("starting main server thread\n");
           ClientThreads[ThreadIndex].Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, (void *) &serverPort, 0, &ClientThreads[ThreadIndex].ID);
  
         for(ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {         for(ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {
                 printf("created client thread %d\n",ThreadIndex + 1);                  ServerThread.Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, (void *) &serverPort, 0, &ServerThread.ID);
                 ServerThread.Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, &serverPort, 0, &ServerThread.ID);  
         }         }
           trace("%d clients started\n", NUM_CLIENTS);
   
           // wait for all clients to receive data before cleaning up
           while (clientsDone != NUM_CLIENTS)
                   SwitchToThread();
   
           free(ClientThreads);
  
         trace("test_ClientServerBlocking_1 done\n");         trace("test_ClientServerBlocking_1 done\n");
 } }
Line 252 
Line 279 
   int wsastartup_result;   int wsastartup_result;
         int versionOK;         int versionOK;
  
           // check for compatible winsock version
         wsastartup_result = WSAStartup(MAKEWORD(1,1), &wsaData);         wsastartup_result = WSAStartup(MAKEWORD(1,1), &wsaData);
         versionOK = (LOBYTE(wsaData.wVersion) == 1) && (HIBYTE(wsaData.wVersion) == 1);         versionOK = (LOBYTE(wsaData.wVersion) == 1) && (HIBYTE(wsaData.wVersion) == 1);
  
Line 262 
Line 290 
         }         }
  
    ok((wsastartup_result == NO_ERROR), "Error in WSAStartup()");    ok((wsastartup_result == NO_ERROR), "Error in WSAStartup()");
            trace("startup ok\n");
 } }
  
 START_TEST(wsock32_main) START_TEST(wsock32_main)
Line 272 
Line 301 
   trace("test 2 of 2:\n");   trace("test 2 of 2:\n");
   test_ClientServerBlocking_1();   test_ClientServerBlocking_1();
   trace("all tests done\n");   trace("all tests done\n");
   
           // wait for all clients to receive data before cleaning up
         while (clientsDone != NUM_CLIENTS)         while (clientsDone != NUM_CLIENTS)
                 ;                  SwitchToThread();
   
           free(testData);
 } }

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.21
Rizwan Kassim
 Powered by
ViewCVS 0.9.2