X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fserver.c;h=7bb503364b0f8894943981c61fec6c73ce739f54;hb=0db1a9eb32ffdba4d43a685b626e4271be5603ba;hp=5d46f200144fea62d62dee7cbbcff27eb1349198;hpb=de8ff799edf1fbfeee9447923497273dd254252c;p=tpg%2Facess2.git diff --git a/AcessNative/acesskernel_src/server.c b/AcessNative/acesskernel_src/server.c index 5d46f200..7bb50336 100644 --- a/AcessNative/acesskernel_src/server.c +++ b/AcessNative/acesskernel_src/server.c @@ -17,6 +17,7 @@ # include #endif #include "../syscalls.h" +//#include #define USE_TCP 0 #define MAX_CLIENTS 16 @@ -36,11 +37,17 @@ typedef struct { // === IMPORTS === extern tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength); +extern int Threads_CreateRootProcess(void); +extern void Threads_SetThread(int TID); +// HACK: Should have these in a header +extern void Log_Debug(const char *Subsys, const char *Message, ...); +extern void Log_Notice(const char *Subsys, const char *Message, ...); // === PROTOTYPES === tClient *Server_GetClient(int ClientID); int Server_WorkerThread(void *ClientPtr); int SyscallServer(void); + int Server_ListenThread(void *Unused); // === GLOBALS === #ifdef __WIN32__ @@ -50,8 +57,8 @@ SOCKET gSocket = INVALID_SOCKET; # define INVALID_SOCKET -1 int gSocket = INVALID_SOCKET; #endif - int giServer_NextClientID = 1; tClient gaServer_Clients[MAX_CLIENTS]; +SDL_Thread *gpServer_ListenThread; // === CODE === int Server_GetClientID(void) @@ -75,12 +82,17 @@ tClient *Server_GetClient(int ClientID) tClient *ret = NULL; int i; + // Allocate an ID if needed + if(ClientID == 0) + ClientID = Threads_CreateRootProcess(); + for( i = 0; i < MAX_CLIENTS; i ++ ) { if( gaServer_Clients[i].ClientID == ClientID ) { - ret = &gaServer_Clients[i]; - break; + return &gaServer_Clients[i]; } + if(!ret && gaServer_Clients[i].ClientID == 0) + ret = &gaServer_Clients[i]; } // Uh oh, no free slots @@ -88,20 +100,18 @@ tClient *Server_GetClient(int ClientID) if( !ret ) return NULL; - if( ClientID == 0 ) - { - ret->ClientID = giServer_NextClientID ++; - ret->CurrentRequest = NULL; + // Allocate a thread for the process + ret->ClientID = ClientID; + ret->CurrentRequest = NULL; - if( !ret->WorkerThread ) { - ret->WaitFlag = SDL_CreateCond(); - ret->Mutex = SDL_CreateMutex(); - SDL_mutexP( ret->Mutex ); - ret->WorkerThread = SDL_CreateThread( Server_WorkerThread, ret ); - } + if( !ret->WorkerThread ) { + ret->WaitFlag = SDL_CreateCond(); + ret->Mutex = SDL_CreateMutex(); + SDL_mutexP( ret->Mutex ); + ret->WorkerThread = SDL_CreateThread( Server_WorkerThread, ret ); } - return &gaServer_Clients[i]; + return ret; } int Server_WorkerThread(void *ClientPtr) @@ -111,6 +121,7 @@ int Server_WorkerThread(void *ClientPtr) tRequestHeader errorHeader; int retSize = 0; int sentSize; + int cur_client_id = 0; #if USE_TCP #else @@ -120,14 +131,26 @@ int Server_WorkerThread(void *ClientPtr) while( Client->CurrentRequest == NULL ) SDL_CondWait(Client->WaitFlag, Client->Mutex); - printf("Worker for %i, Job: %p\n", Client->ClientID, Client->CurrentRequest); + if(Client->ClientID != cur_client_id) { + Threads_SetThread( Client->ClientID ); + cur_client_id = Client->ClientID; + } // Get the response retHeader = SyscallRecieve(Client->CurrentRequest, &retSize); + + { + int callid = Client->CurrentRequest->CallID; + Log_Debug("AcessSrv", "Client %i request %i %s", + Client->ClientID, callid, + callid < N_SYSCALLS ? casSYSCALL_NAMES[callid] : "UNK" + ); + } + if( !retHeader ) { // Return an error to the client - printf("Error returned by SyscallRecieve\n"); + printf("ERROR: SyscallRecieve failed\n"); errorHeader.CallID = Client->CurrentRequest->CallID; errorHeader.NParams = 0; retHeader = &errorHeader; @@ -138,12 +161,14 @@ int Server_WorkerThread(void *ClientPtr) retHeader->ClientID = Client->ClientID; // Mark the thread as ready for another job + free(Client->CurrentRequest); Client->CurrentRequest = 0; - printf("Sending %i to %x:%i\n", - retSize, ntohl(Client->ClientAddr.sin_addr.s_addr), - ntohs(Client->ClientAddr.sin_port) - ); +// Log_Debug("AcessSrv", "Sending %i to %x:%i (Client %i)", +// retSize, ntohl(Client->ClientAddr.sin_addr.s_addr), +// ntohs(Client->ClientAddr.sin_port), +// Client->ClientID +// ); // Return the data sentSize = sendto(gSocket, retHeader, retSize, 0, @@ -213,8 +238,13 @@ int SyscallServer(void) listen(gSocket, 5); #endif - Log_Notice("Syscall", "Listening on 0.0.0.0:%i\n", SERVER_PORT); - + Log_Notice("AcessSrv", "Listening on 0.0.0.0:%i", SERVER_PORT); + gpServer_ListenThread = SDL_CreateThread( Server_ListenThread, NULL ); + return 0; +} + +int Server_ListenThread(void *Unused) +{ // Wait for something to do :) for( ;; ) { @@ -227,7 +257,7 @@ int SyscallServer(void) break ; } - printf("Client connection %x:%i", + Log("Client connection %x:%i\n", ntohl(client.sin_addr), ntohs(client.sin_port) ); @@ -236,9 +266,11 @@ int SyscallServer(void) tRequestHeader *req = (void*)data; struct sockaddr_in addr; uint clientSize = sizeof(addr); - int length = recvfrom(gSocket, data, BUFSIZ, 0, (struct sockaddr*)&addr, &clientSize); + int length; tClient *client; + length = recvfrom(gSocket, data, BUFSIZ, 0, (struct sockaddr*)&addr, &clientSize); + if( length == -1 ) { perror("SyscallServer - recv"); break; @@ -246,11 +278,12 @@ int SyscallServer(void) // Hand off to a worker thread // - TODO: Actually have worker threads - printf("%i bytes from %x:%i\n", length, - ntohl(addr.sin_addr.s_addr), ntohs(addr.sin_port)); +// Log_Debug("Server", "%i bytes from %x:%i", length, +// ntohl(addr.sin_addr.s_addr), ntohs(addr.sin_port)); client = Server_GetClient(req->ClientID); - if( req->ClientID == 0 ) + // NOTE: Hack - Should check if all zero + if( req->ClientID == 0 || client->ClientAddr.sin_port == 0 ) { memcpy(&client->ClientAddr, &addr, sizeof(addr)); } @@ -269,12 +302,15 @@ int SyscallServer(void) continue; } - printf("client = %p, ClientID = %i\n", client, client->ClientID); - + Log_Debug("AcessSrv", "Message from Client %i (%p)", + client->ClientID, client); + + // Make a copy of the request data + req = malloc(length); + memcpy(req, data, length); client->CurrentRequest = req; SDL_CondSignal(client->WaitFlag); #endif } - return -1; }