--- libaitsess/inc/aitsess.h 2012/02/10 16:52:37 1.3.2.4 +++ libaitsess/inc/aitsess.h 2012/07/22 22:13:48 1.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsess.h,v 1.3.2.4 2012/02/10 16:52:37 misho Exp $ +* $Id: aitsess.h,v 1.6 2012/07/22 22:13:48 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, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,9 +47,9 @@ SUCH DAMAGE. #define __AITSESS_H +#include #include #include -#include #include #define SHARED_UNKNOWN -1 @@ -67,13 +67,14 @@ SUCH DAMAGE. #define MAX_SEMNAME 14 -struct tagSess; -typedef struct tagSess ait_sess_t; +/* Shared memory session */ -struct tagSess { +typedef struct tagSess { key_t key; char type; char zcpy; + + char name[BUFSIZ]; off_t eom; void *addr; off_t offset; @@ -87,26 +88,24 @@ struct tagSess { } id; struct { - int (*create)(const char *, int, long, ait_sess_t * __restrict, ...); - void (*destroy)(const char*, ait_sess_t * __restrict); - void *(*attach)(ait_sess_t * __restrict, void *); - void (*detach)(ait_sess_t * __restrict); - void (*notSem)(ait_sess_t * __restrict); - int (*isSemOK)(ait_sess_t * __restrict); - int (*incSem)(ait_sess_t * __restrict); - int (*decSem)(ait_sess_t * __restrict); + int (*create)(int, long, void *, ...); + void (*destroy)(void *); + void *(*attach)(void *, void *); + void (*detach)(void *); + void (*notSem)(void *); + int (*isSemOK)(void *); + int (*incSem)(void *); + int (*decSem)(void *); } sess; -}; +} ait_sess_t; -// ------------------------------------------------------- // sess_GetErrno() Get error code of last operation inline int sess_GetErrno(); // sess_GetError() Get error text of last operation inline const char *sess_GetError(); // sess_SetErr() Set error to variables for internal use!!! inline void sess_SetErr(int eno, char *estr, ...); -// ------------------------------------------------------- /* @@ -121,52 +120,46 @@ int sess_initSession(int id, const char *csFName, ait_ /* * sess_freeSession() Free allocated memory for session item and delete session file if present name * - * @csFName = Session filename for delete, if NULL nothing delete * @Sess = Session item * return: none */ -void sess_freeSession(const char *csFName, ait_sess_t ** __restrict Sess); +void sess_freeSession(ait_sess_t ** __restrict Sess); - /* * map_createSession() MMAP Created session and allocated resources * - * @csFName = Session name for identified * @nSeed = Seed for securing key, if =-1 must add ready for use key * @nSize = Allocated shared memory size in bytes * @Sess = Session item * @... = If nSeed == -1 add ready for use key value * return: 0 Ok successful, -1 error: not allocated resources */ -int map_createSession(const char *csFName, int nSeed, long nSize, ait_sess_t * __restrict Sess, ...); +int map_createSession(int nSeed, long nSize, ait_sess_t * __restrict Sess, ...); /* * map_destroySession() MMAP free shared resources * - * @csFName = Session name for delete * @Sess = Session item * return: none */ -void map_destroySession(const char *csFName, ait_sess_t * __restrict Sess); +void map_destroySession(ait_sess_t * __restrict Sess); /* * ipc_createSession() IPC Created session and allocated resources * - * @csFName = Session name for identified * @nSeed = Seed for securing key, if =-1 must add ready for use key * @nSize = Allocated shared memory size in bytes * @Sess = Session item * @... = If nSeed == -1 add ready for use key value * return: 0 Ok successful, -1 error: not allocated resources */ -int ipc_createSession(const char *csFName, int nSeed, long nSize, ait_sess_t * __restrict Sess, ...); +int ipc_createSession(int nSeed, long nSize, ait_sess_t * __restrict Sess, ...); /* * ipc_destroySession() IPC free shared resources * - * @csFName = Session name for delete * @Sess = Session item * return: none */ -void ipc_destroySession(const char *csFName, ait_sess_t * __restrict Sess); +void ipc_destroySession(ait_sess_t * __restrict Sess); /* * map_attachSession() MMAP Attach to shared memory & return begin address @@ -270,18 +263,16 @@ int ipc_decSemaphore(ait_sess_t * __restrict s); /* --------------------------------------------------------- */ -#define ALLOC_MEMORY(fname, sd, siz, s, ...) (assert((s)), (s)->sess.create((fname), (sd), \ - (siz), (s), ## __VA_ARGS__)) -#define FREE_MEMORY(fname, s) do { assert((s)); \ - (s)->sess.destroy((fname), (s)); \ - } while(0) -#define ATTACH_MEMORY(s) (assert((s)), (s)->sess.attach((s), NULL)) -#define DETACH_MEMORY(s) do { assert((s)); (s)->sess.detach((s)); } while(0) +#define ALLOC_MEMORY(sd, siz, s, ...) (assert((s)), (s)->sess.create((sd), \ + (siz), (s), ## __VA_ARGS__)) +#define ATTACH_MEMORY(s) (assert((s)), (s)->sess.attach((s), NULL)) +#define DETACH_MEMORY(s) do { assert((s)); (s)->sess.detach((s)); } while(0) +#define FREE_MEMORY(s) do { assert((s)); (s)->sess.destroy((s)); } while(0) -#define IS_SEMOK(s) (assert((s)), (s)->sess.isSemOK((s))) -#define INC_SEM(s) (assert((s)), (s)->sess.incSem((s))) -#define DEC_SEM(s) (assert((s)), (s)->sess.decSem((s))) -#define NOT_SEM(s) do { assert((s)); (s)->sess.notSem((s)); } while(0) +#define IS_SEMOK(s) (assert((s)), (s)->sess.isSemOK((s))) +#define INC_SEM(s) (assert((s)), (s)->sess.incSem((s))) +#define DEC_SEM(s) (assert((s)), (s)->sess.decSem((s))) +#define NOT_SEM(s) do { assert((s)); (s)->sess.notSem((s)); } while(0) /* --------------------------------------------------------- */