--- libaitsess/src/aitsess.c 2012/02/28 13:00:24 1.5 +++ libaitsess/src/aitsess.c 2013/01/17 13:26:37 1.6.4.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsess.c,v 1.5 2012/02/28 13:00:24 misho Exp $ +* $Id: aitsess.c,v 1.6.4.3 2013/01/17 13:26:37 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -44,7 +44,6 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF TH SUCH DAMAGE. */ #include "global.h" -#include "aitsess.h" #pragma GCC visibility push(hidden) @@ -54,7 +53,6 @@ char sess_Error[STRSIZ]; #pragma GCC visibility pop -// ----------------------------------------------------------- // Error maintenance functions ... @@ -83,12 +81,12 @@ sess_SetErr(int eno, char *estr, ...) va_end(lst); } -// ----------------------------------------------------------- /* - * sess_initSession() Initializing session structure, if session file not exists creating with specified tech + * sess_initSession() - Initializing session structure, + * if session file not exists creating with specified tech * - * @id = Technology using in session. SHARED_IPC IPC tech orSHARED_MAP BSD MemoryMap tech + * @id = Technology using in session. SHARED_IPC IPC tech or SHARED_MAP BSD MemoryMap tech * @csFName = Session filename for build key and identified * @Sess = Session item, if =NULL allocate memory for session after use must be free! * return: 0 OK new key created, -1 error: no memory or file not created, 1 OK key finded @@ -109,7 +107,7 @@ sess_initSession(int id, const char *csFName, ait_sess } if (!*Sess) { - *Sess = malloc(sizeof(ait_sess_t)); + *Sess = e_malloc(sizeof(ait_sess_t)); if (!*Sess) { LOGERR; return -1; @@ -122,21 +120,21 @@ sess_initSession(int id, const char *csFName, ait_sess if (h == -1) { if (errno != EEXIST) { LOGERR; - free(*Sess); + e_free(*Sess); return -1; } /* If key file exist, session already connected */ h = open((*Sess)->name, O_RDONLY); if (h == -1) { LOGERR; - free(*Sess); + e_free(*Sess); return -1; } ret = read(h, szStr, sizeof szStr); if (ret == -1) { LOGERR; close(h); - free(*Sess); + e_free(*Sess); return -1; } if (!strncmp(szStr, "IPC@", 4) && id == SHARED_IPC) { @@ -165,7 +163,7 @@ sess_initSession(int id, const char *csFName, ait_sess sess_SetErr(EPROTONOSUPPORT, "Session type not supported or wrong session type"); close(h); - free(*Sess); + e_free(*Sess); return -1; } /* key found */ @@ -197,7 +195,7 @@ sess_initSession(int id, const char *csFName, ait_sess sess_SetErr(EINVAL, "Session type must be specified"); close(h); unlink(csFName); - free(*Sess); + e_free(*Sess); return -1; } strlcat(szStr, "ELWIX_Session ("PACKAGE_STRING")\n", sizeof szStr); @@ -214,7 +212,7 @@ sess_initSession(int id, const char *csFName, ait_sess } /* - * sess_freeSession() Free allocated memory for session item and delete session file if present name + * sess_freeSession() - Free allocated memory for session item and delete session file if present name * * @Sess = Session item * return: none @@ -234,13 +232,13 @@ sess_freeSession(ait_sess_t ** __restrict Sess) (*Sess)->type = SHARED_UNKNOWN; */ - free(*Sess); + e_free(*Sess); *Sess = NULL; } /* - * map_createSession() MMAP Created session and allocated resources + * map_createSession() - MMAP Created session and allocated resources * * @nSeed = Seed for securing key, if =-1 must add ready for use key * @nSize = Allocated shared memory size in bytes @@ -310,7 +308,7 @@ map_createSession(int nSeed, long nSize, ait_sess_t * return -1; } #else - /* if is new shared memory session, fill file with zeros */ + /* if is new shared memory session, fill file with zeros */ if (lseek(Sess->mem.fd, nSize - 1, SEEK_SET) == -1) { LOGERR; map_destroySession(Sess); @@ -326,7 +324,7 @@ map_createSession(int nSeed, long nSize, ait_sess_t * } /* - * map_destroySession() MMAP free shared resources + * map_destroySession() - MMAP free shared resources * * @Sess = Session item * return: none @@ -366,7 +364,7 @@ map_destroySession(ait_sess_t * __restrict Sess) } /* - * ipc_createSession() IPC Created session and allocated resources + * ipc_createSession() - IPC Created session and allocated resources * * @nSeed = Seed for securing key, if =-1 must add ready for use key * @nSize = Allocated shared memory size in bytes @@ -427,7 +425,7 @@ ipc_createSession(int nSeed, long nSize, ait_sess_t * } /* - * ipc_destroySession() IPC free shared resources + * ipc_destroySession() - IPC free shared resources * * @Sess = Session item * return: none @@ -453,7 +451,7 @@ ipc_destroySession(ait_sess_t * __restrict Sess) /* - * map_attachSession() MMAP Attach to shared memory & return begin address + * map_attachSession() - MMAP Attach to shared memory & return begin address * * @s = Session item * @procMem = Custom start address (optionl) *default must be 0* @@ -478,7 +476,7 @@ map_attachSession(ait_sess_t * __restrict s, void *pro } /* - * map_detachSession() MMAP Detach from shared memory + * map_detachSession() - MMAP Detach from shared memory * * @s = Session item * return: none @@ -498,7 +496,7 @@ map_detachSession(ait_sess_t * __restrict s) } /* - * ipc_attachSession() IPC Attach to shared memory & return begin address + * ipc_attachSession() - IPC Attach to shared memory & return begin address * * @s = Session item * @procMem = Custom start address (optionl) *default must be 0* @@ -520,7 +518,7 @@ ipc_attachSession(ait_sess_t * __restrict s, void *pro } /* - * ipc_detachSession() IPC Detach from shared memory + * ipc_detachSession() - IPC Detach from shared memory * * @s = Session item * return: none @@ -538,7 +536,7 @@ ipc_detachSession(ait_sess_t * __restrict s) } /* - * sess_isAttached() Check for attached shared memory + * sess_isAttached() - Check for attached shared memory * * @s = Session item * return: -1 null session item, 0 not attached, 1 attached memory @@ -554,7 +552,7 @@ sess_isAttached(ait_sess_t * __restrict s) /* - * map_notSemaphore() MMAP negative block if semaphore isn`t signaled + * map_notSemaphore() - MMAP negative block if semaphore isn`t signaled * * @s = Session item * return: none @@ -575,7 +573,7 @@ map_notSemaphore(ait_sess_t * __restrict s) } /* - * map_isSemaphoreOK() MMAP Check semaphore + * map_isSemaphoreOK() - MMAP Check semaphore * * @s = Session item * return: -1 error: can`t return semaphore, 0 = false, 1 = true @@ -593,7 +591,7 @@ map_isSemaphoreOK(ait_sess_t * __restrict s) } /* - * map_incSemaphore() MMAP unblock semaphore, increment semaphore + * map_incSemaphore() - MMAP unblock semaphore, increment semaphore * * @s = Session item * return: 0 Ok, -1 error: can`t increment @@ -608,7 +606,7 @@ map_incSemaphore(ait_sess_t * __restrict s) } /* - * map_decSemaphore() MMAP block semaphore, decrement semaphore + * map_decSemaphore() - MMAP block semaphore, decrement semaphore * * @s = Session item * return: 0 Ok, -1 error: can`t decrement @@ -623,7 +621,7 @@ map_decSemaphore(ait_sess_t * __restrict s) } /* - * ipc_notSemaphore() IPC negative block if semaphore isn`t signaled + * ipc_notSemaphore() - IPC negative block if semaphore isn`t signaled * * @s = Session item * return: none @@ -638,7 +636,7 @@ ipc_notSemaphore(ait_sess_t * __restrict s) } /* - * ipc_isSemaphoreOK() IPC Check semaphore + * ipc_isSemaphoreOK() - IPC Check semaphore * * @s = Session item * return: -1 error: can`t return semaphore, 0 = false, 1 = true @@ -655,7 +653,7 @@ ipc_isSemaphoreOK(ait_sess_t * __restrict s) } /* - * ipc_incSemaphore() IPC unblock semaphore, increment semaphore + * ipc_incSemaphore() - IPC unblock semaphore, increment semaphore * * @s = Session item * return: 0 Ok, -1 error: can`t increment @@ -672,7 +670,7 @@ ipc_incSemaphore(ait_sess_t * __restrict s) } /* - * ipc_decSemaphore() IPC block semaphore, decrement semaphore + * ipc_decSemaphore() - IPC block semaphore, decrement semaphore * * @s = Session item * return: 0 Ok, -1 error: can`t decrement