lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 12:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

sproto optimize, malloc newchunk and return directly if sz >= CHUNK_SIZE in pool_alloc, do not replace current chunk if sz >= p->current_used in pool_alloc, more safety checking

Browse Source
This commit is contained in:
cxj
2015-07-10 20:21:07 +08:00
parent 21c941fe63
commit d9ad981c8c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lualib-src/sproto/sproto.c
View File

@@ -83,7 +83,7 @@ static void *
pool_alloc(struct pool *p, size_t sz) { pool_alloc(struct pool *p, size_t sz) {
// align by 8 // align by 8
sz = (sz + 7) & ~7; sz = (sz + 7) & ~7;
if (sz > CHUNK_SIZE) { if (sz >= CHUNK_SIZE) {
return pool_newchunk(p, sz); return pool_newchunk(p, sz);
} }
if (p->current == NULL) { if (p->current == NULL) {
@@ -97,7 +97,7 @@ pool_alloc(struct pool *p, size_t sz) {
return ret; return ret;
} }
if (sz > p->current_used) { if (sz >= p->current_used) {
return pool_newchunk(p, sz); return pool_newchunk(p, sz);
} else { } else {
void * ret = pool_newchunk(p, CHUNK_SIZE); void * ret = pool_newchunk(p, CHUNK_SIZE);
@@ -305,7 +305,7 @@ import_type(struct sproto *s, struct sproto_type *t, const uint8_t * stream) {
if (stream == NULL) if (stream == NULL)
return NULL; return NULL;
tag = f->tag; tag = f->tag;
if (tag < last) if (tag <= last)
return NULL; // tag must in ascending order return NULL; // tag must in ascending order
if (tag > last+1) { if (tag > last+1) {
++maxn; ++maxn;
@@ -394,7 +394,7 @@ create_from_bundle(struct sproto *s, const uint8_t * stream, size_t sz) {
const uint8_t * protocoldata = NULL; const uint8_t * protocoldata = NULL;
int fn = struct_field(stream, sz); int fn = struct_field(stream, sz);
int i; int i;
if (fn < 0) if (fn < 0 || fn > 2)
return NULL; return NULL;
stream += SIZEOF_HEADER; stream += SIZEOF_HEADER;