version 1.3.2.4, 2011/09/07 21:37:23
|
version 1.3.2.7, 2011/11/03 15:36:03
|
Line 359 sess_prepareSession(tagSess * __restrict s, u_char use
|
Line 359 sess_prepareSession(tagSess * __restrict s, u_char use
|
|
|
DEC_SEMAPHORE(s, ret); |
DEC_SEMAPHORE(s, ret); |
s->zcopy = useDirect; |
s->zcopy = useDirect; |
arr = io_map2vals(s->addr + sizeof(sess_hdr_t), s->eom - sizeof(sess_hdr_t), | arr = io_map2vars(s->addr + sizeof(sess_hdr_t), s->eom - sizeof(sess_hdr_t), |
hdr->hdr_argc, useDirect); |
hdr->hdr_argc, useDirect); |
ADD_SEMAPHORE(s, ret); |
ADD_SEMAPHORE(s, ret); |
|
|
Line 408 sess_commitSession(tagSess * __restrict s, array_t * _
|
Line 408 sess_commitSession(tagSess * __restrict s, array_t * _
|
return -1; |
return -1; |
} |
} |
|
|
if (!s->zcopy) | ATTACH_MEMORY(s); |
ATTACH_MEMORY(s); | |
if (!s->addr) { |
if (!s->addr) { |
if (!s->zcopy) | DETACH_MEMORY(s); |
DETACH_MEMORY(s); | |
| |
return -1; |
return -1; |
} else |
} else |
hdr = (sess_hdr_t*) s->addr; |
hdr = (sess_hdr_t*) s->addr; |
|
|
DEC_SEMAPHORE(s, rs); |
DEC_SEMAPHORE(s, rs); |
if ((ret = io_vals2map(s->addr + sizeof(sess_hdr_t), s->eom - sizeof(sess_hdr_t), arr)) != -1) { | if ((ret = io_vars2map(s->addr + sizeof(sess_hdr_t), s->eom - sizeof(sess_hdr_t), arr)) != -1) { |
hdr->hdr_magic = SESS_AIT_MAGIC; |
hdr->hdr_magic = SESS_AIT_MAGIC; |
hdr->hdr_argc = io_arraySize(arr); |
hdr->hdr_argc = io_arraySize(arr); |
ret += sizeof(sess_hdr_t); |
ret += sizeof(sess_hdr_t); |
} |
} |
ADD_SEMAPHORE(s, rs); |
ADD_SEMAPHORE(s, rs); |
|
|
if (!s->zcopy) | DETACH_MEMORY(s); |
DETACH_MEMORY(s); | |
return ret; |
return ret; |
} |
} |