Redefine clients as a fixed array
This removes yet another xalloc() each server generation. Also, I couldn't find the corresponding xfree() so I guess that used to be a memory leak there.
This commit is contained in:
parent
5532d63488
commit
277a74bcbb
|
@ -78,7 +78,7 @@ PtrCtrl defaultPointerControl = {
|
||||||
DEFAULT_PTR_THRESHOLD,
|
DEFAULT_PTR_THRESHOLD,
|
||||||
0};
|
0};
|
||||||
|
|
||||||
_X_EXPORT ClientPtr *clients;
|
_X_EXPORT ClientPtr clients[MAXCLIENTS];
|
||||||
_X_EXPORT ClientPtr serverClient;
|
_X_EXPORT ClientPtr serverClient;
|
||||||
_X_EXPORT int currentMaxClients; /* current size of clients array */
|
_X_EXPORT int currentMaxClients; /* current size of clients array */
|
||||||
_X_EXPORT long maxBigRequestSize = MAX_BIG_REQUEST_SIZE;
|
_X_EXPORT long maxBigRequestSize = MAX_BIG_REQUEST_SIZE;
|
||||||
|
|
|
@ -284,9 +284,6 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
{
|
{
|
||||||
CreateWellKnownSockets();
|
CreateWellKnownSockets();
|
||||||
InitProcVectors();
|
InitProcVectors();
|
||||||
clients = (ClientPtr *)xalloc(MAXCLIENTS * sizeof(ClientPtr));
|
|
||||||
if (!clients)
|
|
||||||
FatalError("couldn't create client array");
|
|
||||||
for (i=1; i<MAXCLIENTS; i++)
|
for (i=1; i<MAXCLIENTS; i++)
|
||||||
clients[i] = NullClient;
|
clients[i] = NullClient;
|
||||||
serverClient = (ClientPtr)xalloc(sizeof(ClientRec));
|
serverClient = (ClientPtr)xalloc(sizeof(ClientRec));
|
||||||
|
|
|
@ -119,7 +119,7 @@ typedef struct _Client *ClientPtr; /* also in misc.h */
|
||||||
|
|
||||||
typedef struct _WorkQueue *WorkQueuePtr;
|
typedef struct _WorkQueue *WorkQueuePtr;
|
||||||
|
|
||||||
extern ClientPtr *clients;
|
extern ClientPtr clients[MAXCLIENTS];
|
||||||
extern ClientPtr serverClient;
|
extern ClientPtr serverClient;
|
||||||
extern int currentMaxClients;
|
extern int currentMaxClients;
|
||||||
extern char dispatchExceptionAtReset;
|
extern char dispatchExceptionAtReset;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user