--- libaitsess/src/sess.c 2011/04/30 22:02:59 1.2.2.1 +++ libaitsess/src/sess.c 2012/07/22 22:13:48 1.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: sess.c,v 1.2.2.1 2011/04/30 22:02:59 misho Exp $ +* $Id: sess.c,v 1.5 2012/07/22 22:13:48 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -49,26 +49,34 @@ SUCH DAMAGE. /* * sess_FreeValues() Free all values from value array allocated from sess_GetValues() + * * @ppsVals = Array strings * return: none -*/ -inline void sess_FreeValues(char *** __restrict ppsVals) + */ +inline void +sess_FreeValues(char *** __restrict ppsVals) { char **ptr; + assert(ppsVals); + if (!ppsVals) + return; + for (ptr = *ppsVals; *ptr; ptr++) - free(*ptr); - free(*ppsVals); + io_free(*ptr); + io_free(*ppsVals); *ppsVals = NULL; } /* * sess_GetValues() Get all values from session shared memory + * * @s = Session item * @ppsVals = Return array strings * return: -1 error: in parameter, !=-1 count of returned strings in ppsVals (must be free after use!) -*/ -int sess_GetValues(tagSess * __restrict s, char ***ppsVals) + */ +int +sess_GetValues(ait_sess_t * __restrict s, char ***ppsVals) { register int i; char **valz, *Shared = NULL; @@ -76,7 +84,7 @@ int sess_GetValues(tagSess * __restrict s, char ***pps if (!s || !ppsVals) return -1; - valz = malloc(sizeof(caddr_t)); + valz = io_malloc(sizeof(caddr_t)); if (!valz) { LOGERR; return -1; @@ -84,10 +92,10 @@ int sess_GetValues(tagSess * __restrict s, char ***pps *valz = NULL; // allocated memory & mirrored shared memory into this - Shared = malloc(s->eom); + Shared = io_malloc(s->eom); if (!Shared) { LOGERR; - free(valz); + io_free(valz); return -1; } else memcpy(Shared, s->addr, s->eom); @@ -99,32 +107,34 @@ int sess_GetValues(tagSess * __restrict s, char ***pps else i++; - valz = realloc(valz, (i + 1) * sizeof(caddr_t)); + valz = io_realloc(valz, (i + 1) * sizeof(caddr_t)); if (!valz) { LOGERR; - free(Shared); + io_free(Shared); return -1; } else valz[i] = NULL; - valz[i - 1] = strdup(peer); + valz[i - 1] = io_strdup(peer); } - free(Shared); + io_free(Shared); *ppsVals = valz; return i; } /* * sess_GetValue() Get value from session shared memory from attribute + * * @s = Session item * @csAttr = Attribute for search * @psVal = Return string buffer * @pnLen = Length of return string buffer, // *{pnLen} input is max_size of buffer & output is really taken bytes * return: 0 not found, -1 error: in parameter, >0 get position, if define item merged with IS_DEF -*/ -int sess_GetValue(tagSess * __restrict s, const char *csAttr, char *psVal, int *pnLen) + */ +int +sess_GetValue(ait_sess_t * __restrict s, const char *csAttr, char *psVal, int *pnLen) { register int i; int def = IS_VAL; @@ -141,7 +151,7 @@ int sess_GetValue(tagSess * __restrict s, const char * } // allocated memory & mirrored shared memory into this - Shared = malloc(s->eom); + Shared = io_malloc(s->eom); if (!Shared) { LOGERR; return -1; @@ -151,7 +161,7 @@ int sess_GetValue(tagSess * __restrict s, const char * for (i = 1, peer = strtok_r(Shared, MEM_DELIM"\r\n", &p_brk); peer; i++, peer = strtok_r(NULL, MEM_DELIM"\r\n", &p_brk)) { attr = strtok_r(peer, "=\r\n", &a_brk); - if (attr && !strncmp(attr, csAttr, MAX_ATTRIBUTE)) { + if (attr && !strncmp(attr, csAttr, MAX_ATTRIBUTE - 1)) { val = strtok_r(NULL, "=\r\n", &a_brk); if (val && strlen(val)) { if (psVal) @@ -161,26 +171,28 @@ int sess_GetValue(tagSess * __restrict s, const char * } else def = IS_DEF; - free(Shared); + io_free(Shared); return i | def; } } - free(Shared); + io_free(Shared); return 0; } /* * sess_DelValue() Delete item from session shared memory + * * @s = Session item * @csAttr = Attribute for erasing * return: 0 Ok, -1 error: in parameter -*/ -int sess_DelValue(tagSess * __restrict s, const char *csAttr) + */ +int +sess_DelValue(ait_sess_t * __restrict s, const char *csAttr) { register int i; - int ret, attrlen; - char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE + 1]; + int attrlen; + char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE]; char *peer, *p_brk; if (!s || !csAttr || !*csAttr) @@ -188,23 +200,22 @@ int sess_DelValue(tagSess * __restrict s, const char * else attrlen = strlen(csAttr); Buffer = Shared = NULL; - memset(szAttr, 0, MAX_ATTRIBUTE + 1); - strncpy(szAttr, csAttr, MAX_ATTRIBUTE - 1); - strcat(szAttr, "="); + strlcpy(szAttr, csAttr, sizeof szAttr); + strlcat(szAttr, "=", sizeof szAttr); - Buffer = malloc(s->eom); + Buffer = io_malloc(s->eom); if (!Buffer) { LOGERR; return -1; } else memset(Buffer, 0, s->eom); - Shared = malloc(s->eom); + Shared = io_malloc(s->eom); if (!Shared) { LOGERR; - free(Buffer); + io_free(Buffer); return -1; } else { - DEC_SEMAPHORE(s, ret); + DEC_SEM(s); memcpy(Shared, s->addr, s->eom); } @@ -215,58 +226,58 @@ int sess_DelValue(tagSess * __restrict s, const char * peer[attrlen] == '\r' || peer[attrlen] == '\n') continue; - strcat(Buffer, peer); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, peer, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); } - memset(s->addr, 0, s->eom); memcpy(s->addr, Buffer, s->eom); if (s->type == SHARED_MAP) msync(s->addr, 0, MS_SYNC | MS_INVALIDATE); - ADD_SEMAPHORE(s, ret); - free(Shared); - free(Buffer); + INC_SEM(s); + io_free(Shared); + io_free(Buffer); return 0; } /* * sess_SetValue() Set item into session shared memory or update if find it + * * @s = Session item * @csAttr = Attribute * @psVal = Value * return: 0 nothing, -1 error: in parameter, >0 set position, if add item merged with IS_ADD and if define item merged with IS_DEF -*/ -int sess_SetValue(tagSess * __restrict s, const char *csAttr, const char *psVal) + */ +int +sess_SetValue(ait_sess_t * __restrict s, const char *csAttr, const char *psVal) { register int i; - int upd, ret, def = IS_VAL; - char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE + 1]; + int upd, def = IS_VAL; + char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE]; char *peer, *p_brk; if (!s || !csAttr || !*csAttr) return -1; else Buffer = Shared = NULL; - memset(szAttr, 0, MAX_ATTRIBUTE + 1); - strncpy(szAttr, csAttr, MAX_ATTRIBUTE - 1); - strcat(szAttr, "="); + strlcpy(szAttr, csAttr, sizeof szAttr); + strlcat(szAttr, "=", sizeof szAttr); - Buffer = malloc(s->eom); + Buffer = io_malloc(s->eom); if (!Buffer) { LOGERR; return -1; } else memset(Buffer, 0, s->eom); - Shared = malloc(s->eom); + Shared = io_malloc(s->eom); if (!Shared) { LOGERR; - free(Buffer); + io_free(Buffer); return -1; } else { - DEC_SEMAPHORE(s, ret); + DEC_SEM(s); memcpy(Shared, s->addr, s->eom); } @@ -275,42 +286,150 @@ int sess_SetValue(tagSess * __restrict s, const char * if (!strncmp(peer, szAttr, strlen(szAttr))) { upd++; if (psVal) { - strcat(Buffer, szAttr); - strcat(Buffer, psVal); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, szAttr, s->eom); + strlcat(Buffer, psVal, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); } else { - strcat(Buffer, csAttr); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, csAttr, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); def = IS_DEF; } continue; } - strcat(Buffer, peer); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, peer, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); } if (!upd) { if (psVal) { - strcat(Buffer, szAttr); - strcat(Buffer, psVal); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, szAttr, s->eom); + strlcat(Buffer, psVal, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); } else { - strcat(Buffer, csAttr); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, csAttr, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); def = IS_DEF; } def |= IS_ADD; } - memset(s->addr, 0, s->eom); memcpy(s->addr, Buffer, s->eom); if (s->type == SHARED_MAP) msync(s->addr, 0, MS_SYNC | MS_INVALIDATE); - ADD_SEMAPHORE(s, ret); - free(Shared); - free(Buffer); + INC_SEM(s); + io_free(Shared); + io_free(Buffer); return upd | def; +} + + +/* + * sess_prepareSession() Attach to shared memory and de-marshaling data + * + * @s = Session + * @useDirect = Use direct shared memory if !=0 or snapshot of data to array + * return: NULL error or no data, !=NULL array with variables, + * after use must free resources with sess_doneSession() + */ +array_t * +sess_prepareSession(ait_sess_t * __restrict s, char useDirect) +{ + array_t *arr = NULL; + sess_hdr_t *hdr; + + assert(s); + if (!s) { + sess_SetErr(EINVAL, "Error:: invalid argument\n"); + return NULL; + } + if (s->addr) { + sess_SetErr(EINVAL, "Error:: already attached memory\n"); + return NULL; + } + + ATTACH_MEMORY(s); + if (!s->addr) + return NULL; + else + hdr = (sess_hdr_t*) s->addr; + if (hdr->hdr_magic != SESS_AIT_MAGIC) { + DETACH_MEMORY(s); + + sess_SetErr(EINVAL, "Error:: shared memory not contains values with proper format\n"); + return NULL; + } + + DEC_SEM(s); + s->zcpy = useDirect; + arr = io_map2vars(s->addr + sizeof(sess_hdr_t), s->eom - sizeof(sess_hdr_t), + hdr->hdr_argc, useDirect); + INC_SEM(s); + + if (!s->zcpy) + DETACH_MEMORY(s); + return arr; +} + +/* + * sess_doneSession() Free resources allocated with sess_prepareSession() + * + * @s = Session + * @arr = Array with variables for free + * return: none + */ +void +sess_doneSession(ait_sess_t * __restrict s, array_t ** __restrict arr) +{ + assert(s); + if (!s) { + sess_SetErr(EINVAL, "Error:: invalid argument\n"); + return; + } + + if (!s->zcpy) + io_arrayFree(*arr); + else + DETACH_MEMORY(s); + io_arrayDestroy(arr); +} + +/* + * sess_commitSession() Commit data to shared memory + * + * @s = Session + * @arr = Array with variables for save + * return -1 error or !=-1 size of stored variables into shared memory + */ +int +sess_commitSession(ait_sess_t * __restrict s, array_t * __restrict arr) +{ + sess_hdr_t *hdr; + int ret = 0; + + assert(s && arr); + if (!s || !arr) { + sess_SetErr(EINVAL, "Error:: invalid argument\n"); + return -1; + } + + ATTACH_MEMORY(s); + if (!s->addr) { + DETACH_MEMORY(s); + return -1; + } else + hdr = (sess_hdr_t*) s->addr; + + DEC_SEM(s); + 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_argc = io_arraySize(arr); + ret += sizeof(sess_hdr_t); + } + INC_SEM(s); + + DETACH_MEMORY(s); + return ret; }