gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

And try to make writes efficient too

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@6119 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-02-26 17:01:32 +00:00
parent eed443a8db
commit 2851421152
1 changed files with 60 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

82
Source/GSTcpPort.m
View file

@ -52,6 +52,7 @@
extern int errno; extern int errno;
#define GS_CONNECTION_MSG 0 #define GS_CONNECTION_MSG 0
#define NETBLOCK 8192
/* /*
* Stuff for setting the sockets into non-blocking mode. * Stuff for setting the sockets into non-blocking mode.
@ -578,18 +579,17 @@ static NSMapTable *tcpHandleTable = 0;
unsigned want; unsigned want;
void *bytes; void *bytes;
int res; int res;
#define RDBLOCK 8192
/* /*
* Make sure we have a buffer big enough to hold all the data we are * Make sure we have a buffer big enough to hold all the data we are
* expecting, or RDBLOCK bytes, whichever is greater. * expecting, or NETBLOCK bytes, whichever is greater.
*/ */
if (rData == nil) if (rData == nil)
{ {
rData = [[NSMutableData alloc] initWithLength: RDBLOCK]; rData = [[NSMutableData alloc] initWithLength: NETBLOCK];
rWant = sizeof(GSPortItemHeader); rWant = sizeof(GSPortItemHeader);
rLength = 0; rLength = 0;
want = RDBLOCK; want = NETBLOCK;
} }
else else
{ {
@ -599,9 +599,9 @@ static NSMapTable *tcpHandleTable = 0;
want = rWant; want = rWant;
[rData setLength: want]; [rData setLength: want];
} }
if (want < RDBLOCK) if (want < NETBLOCK)
{ {
want = RDBLOCK; want = NETBLOCK;
[rData setLength: want]; [rData setLength: want];
} }
} }
@ -1556,32 +1556,35 @@ static NSMapTable *tcpPortMap = 0;
h = [self handleForPort: (GSTcpPort*)receivingPort beforeDate: when]; h = [self handleForPort: (GSTcpPort*)receivingPort beforeDate: when];
if (h != nil) if (h != nil)
{ {
NSMutableData *d; NSMutableData *header;
unsigned hLength;
unsigned l; unsigned l;
GSPortItemHeader *pih; GSPortItemHeader *pih;
GSPortMsgHeader *pmh; GSPortMsgHeader *pmh;
unsigned c = [components count]; unsigned c = [components count];
unsigned i; unsigned i;
BOOL pack = YES;
/* /*
* Ok - ensure we have space to insert header info. * Ok - ensure we have space to insert header info.
*/ */
if (length == 0 && rl != 0) if (length == 0 && rl != 0)
{ {
NSMutableData *header = [NSMutableData new]; header = [[NSMutableData alloc] initWithCapacity: NETBLOCK];
[header setLength: rl]; [header setLength: rl];
[components insertObject: header atIndex: 0]; [components insertObject: header atIndex: 0];
RELEASE(header); RELEASE(header);
} }
d = [components objectAtIndex: 0]; header = [components objectAtIndex: 0];
/* /*
* The Item header contains the item type and the length of the * The Item header contains the item type and the length of the
* data in the item (excluding the item header itsself). * data in the item (excluding the item header itsself).
*/ */
l = [d length] - sizeof(GSPortItemHeader); hLength = [header length];
pih = (GSPortItemHeader*)[d mutableBytes]; l = hLength - sizeof(GSPortItemHeader);
pih = (GSPortItemHeader*)[header mutableBytes];
pih->type = GSSwapHostI32ToBig(GSP_HEAD); pih->type = GSSwapHostI32ToBig(GSP_HEAD);
pih->length = GSSwapHostI32ToBig(l); pih->length = GSSwapHostI32ToBig(l);
@ -1596,6 +1599,9 @@ static NSMapTable *tcpPortMap = 0;
/* /*
* Now insert item header information as required. * Now insert item header information as required.
* Pack as many items into the initial data object as possible, up to
* a maximum of NETBLOCK bytes. This is to try to get a single,
* efficient write operation if possible.
*/ */
c = [components count]; c = [components count];
for (i = 1; i < c; i++) for (i = 1; i < c; i++)
@ -1604,25 +1610,57 @@ static NSMapTable *tcpPortMap = 0;
if ([o isKindOfClass: [NSData class]]) if ([o isKindOfClass: [NSData class]])
{ {
NSMutableData *d;
GSPortItemHeader *pih; GSPortItemHeader *pih;
unsigned h = sizeof(GSPortItemHeader); unsigned h = sizeof(GSPortItemHeader);
unsigned l = [o length]; unsigned l = [o length];
void *b; void *b;
d = [NSMutableData dataWithLength: l + h]; if (pack == YES && hLength + l + h <= NETBLOCK)
b = [d mutableBytes]; {
pih = (GSPortItemHeader*)b; [header setLength: hLength + l + h];
memcpy(b+h, [o bytes], l); b = [header mutableBytes];
pih->type = GSSwapHostI32ToBig(GSP_DATA); b += hLength;
pih->length = GSSwapHostI32ToBig(l); hLength += l + h;
[components replaceObjectAtIndex: i pih = (GSPortItemHeader*)b;
withObject: d]; memcpy(b+h, [o bytes], l);
pih->type = GSSwapHostI32ToBig(GSP_DATA);
pih->length = GSSwapHostI32ToBig(l);
}
else
{
NSMutableData *d;
pack = NO;
d = [NSMutableData dataWithLength: l + h];
b = [d mutableBytes];
pih = (GSPortItemHeader*)b;
memcpy(b+h, [o bytes], l);
pih->type = GSSwapHostI32ToBig(GSP_DATA);
pih->length = GSSwapHostI32ToBig(l);
[components replaceObjectAtIndex: i
withObject: d];
}
} }
else if ([o isKindOfClass: [GSTcpPort class]]) else if ([o isKindOfClass: [GSTcpPort class]])
{ {
[components replaceObjectAtIndex: i NSData *d = encodePort(o);
withObject: encodePort(o)]; unsigned dLength = [d length];
if (pack == YES && hLength + dLength <= NETBLOCK)
{
void *b;
[header setLength: hLength + dLength];
b = [header mutableBytes];
b += hLength;
hLength += dLength;
memcpy(b, [d bytes], dLength);
}
else
{
pack = NO;
[components replaceObjectAtIndex: i withObject: d];
}
} }
} }