--- libaitio/src/aitio.c 2011/04/20 22:55:41 1.4.2.2 +++ libaitio/src/aitio.c 2012/05/23 12:16:13 1.10.6.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.c,v 1.4.2.2 2011/04/20 22:55:41 misho Exp $ +* $Id: aitio.c,v 1.10.6.3 2012/05/23 12:16:13 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 @@ -51,6 +51,8 @@ int io_Debug; #pragma GCC visibility push(hidden) +int io_mpool; + int io_Errno; char io_Error[STRSIZ]; @@ -58,19 +60,22 @@ char io_Error[STRSIZ]; // io_GetErrno() Get error code of last operation -inline int io_GetErrno() +inline int +io_GetErrno() { return io_Errno; } // io_GetError() Get error text of last operation -inline const char *io_GetError() +inline const char * +io_GetError() { return io_Error; } // io_SetErr() Set error to variables for internal use!!! -inline void io_SetErr(int eno, char *estr, ...) +inline void +io_SetErr(int eno, char *estr, ...) { va_list lst; @@ -81,16 +86,43 @@ inline void io_SetErr(int eno, char *estr, ...) va_end(lst); } +// mpool_inuse() Check for mpool usage +inline int +mpool_inuse() +{ + return io_mpool; +} + +// init libaitio routine +void +_init() +{ +#ifdef USE_MPOOL + io_mpool = 42; +#else + io_mpool = 0; +#endif +} + +// fini libaitio routine +void +_fini() +{ +} + + /* - * ioPromptRead() Read data from input h[0] with prompt to output h[1] + * ioPromptRead() - Read data from input h[0] with prompt to output h[1] + * * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout * @csPrompt = Prompt before input, may be NULL * @psData = Readed data * @dataLen = Length of data * return: 0 EOF; -1 error:: can`t read; >0 count of readed chars */ -int ioPromptRead(int *h, const char *csPrompt, char * __restrict psData, int dataLen) +int +ioPromptRead(int *h, const char *csPrompt, char * __restrict psData, int dataLen) { int ok = 0; FILE *inp, *out; @@ -135,7 +167,8 @@ int ioPromptRead(int *h, const char *csPrompt, char * } /* - * ioPromptPassword() Read password from input h[0] with prompt to output h[1] + * ioPromptPassword() - Read password from input h[0] with prompt to output h[1] + * * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout * @csPrompt = Prompt before input, may be NULL * @psPass = Readed password @@ -143,7 +176,8 @@ int ioPromptRead(int *h, const char *csPrompt, char * * @confirm = Confirm password, 0 - get password, !=0 Ask for confirmation * return: 0 EOF; -1 error:: can`t read; >0 count of readed chars */ -int ioPromptPassword(int *h, const char *csPrompt, char * __restrict psPass, int passLen, int confirm) +int +ioPromptPassword(int *h, const char *csPrompt, char * __restrict psPass, int passLen, int confirm) { int ret, ok = 0; FILE *inp, *out; @@ -220,14 +254,16 @@ next: } /* - * ioRegexVerify() Function for verify data match in regex expression + * ioRegexVerify() - Function for verify data match in regex expression + * * @csRegex = Regulare expression pattern * @csData = Data for check and verify * @startPos = Return start positions * @endPos = Return end positions * return: NULL not match or error; !=NULL begin of matched data */ -const char *ioRegexVerify(const char *csRegex, const char *csData, int *startPos, int *endPos) +const char * +ioRegexVerify(const char *csRegex, const char *csData, int *startPos, int *endPos) { regex_t re; regmatch_t match; @@ -240,7 +276,7 @@ const char *ioRegexVerify(const char *csRegex, const c if ((ret = regcomp(&re, csRegex, REG_EXTENDED))) { regerror(ret, &re, szErr, STRSIZ); - io_SetErr(ret, "Error:: %s\n", szErr); + io_SetErr(ret, "%s", szErr); regfree(&re); return NULL; } @@ -258,7 +294,7 @@ const char *ioRegexVerify(const char *csRegex, const c if (ret) { regerror(ret, &re, szErr, STRSIZ); - io_SetErr(ret, "Error:: %s\n", szErr); + io_SetErr(ret, "%s", szErr); pos = NULL; } @@ -267,14 +303,16 @@ const char *ioRegexVerify(const char *csRegex, const c } /* - * ioRegexGet() Function for get data match in regex expression + * ioRegexGet() - Function for get data match in regex expression + * * @csRegex = Regulare expression pattern * @csData = Data from get * @psString = Returned string if match * @strLen = Length of string * return: 0 not match; >0 count of returned chars */ -int ioRegexGet(const char *csRegex, const char *csData, char * __restrict psString, int strLen) +int +ioRegexGet(const char *csRegex, const char *csData, char * __restrict psString, int strLen) { int sp, ep, len; const char *str; @@ -296,13 +334,15 @@ int ioRegexGet(const char *csRegex, const char *csData } /* - * ioRegexReplace() Function for replace data match in regex expression with newdata + * ioRegexReplace() - Function for replace data match in regex expression with newdata + * * @csRegex = Regulare expression pattern * @csData = Source data * @csNew = Data for replace - * return: NULL not match or error; !=NULL allocated new string, must be free after use! + * return: NULL not match or error; !=NULL allocated new string, must be xfree after use! */ -char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew) +char * +ioRegexReplace(const char *csRegex, const char *csData, const char *csNew) { int sp, ep, len; char *str = NULL; @@ -315,7 +355,7 @@ char *ioRegexReplace(const char *csRegex, const char * // ___ before match len = sp + 1; - str = malloc(len); + str = xmalloc(len); if (!str) { LOGERR; return NULL; @@ -324,7 +364,7 @@ char *ioRegexReplace(const char *csRegex, const char * // * replace match * if (csNew) { len += strlen(csNew); - str = realloc(str, len); + str = xrealloc(str, len); if (!str) { LOGERR; return NULL; @@ -333,7 +373,7 @@ char *ioRegexReplace(const char *csRegex, const char * } // after match ___ len += strlen(csData) - ep; - str = realloc(str, len); + str = xrealloc(str, len); if (!str) { LOGERR; return NULL; @@ -344,12 +384,13 @@ char *ioRegexReplace(const char *csRegex, const char * } /* - * ioVarAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" + * ioStrAst() - Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" + * * @csString = Input string - * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free() + * return: NULL error, !=NULL Allocated new string evaluated from input string, must be xfree() */ char * -ioVarAst(const char *csString) +ioStrAst(const char *csString) { char *ext, *str, *out = NULL; int e[2] = { 0 }; @@ -359,7 +400,7 @@ ioVarAst(const char *csString) if (!strchr(csString, '{') || !strrchr(csString, '}')) { memset(io_Error, 0, STRSIZ); - snprintf(io_Error, STRSIZ, "Error:: Invalid input string format ... " + snprintf(io_Error, STRSIZ, "Invalid input string format ... " "must be like {text[:[-]#[:#]]}"); io_Errno = EINVAL; return NULL; @@ -387,14 +428,15 @@ ioVarAst(const char *csString) ext = str; out = strdup(ext); - free(str); + xfree(str); return out; } /* - * ioMkDir() Function for racursive directory creation and validation + * ioMkDir() - Function for racursive directory creation and validation + * * @csDir = Full directory path * @mode = Mode for directory creation if missing dir * return: -1 error, 0 directory path exist, >0 created missing dirs @@ -436,12 +478,13 @@ ioMkDir(const char *csDir, int mode) } end: chdir(szOld); - free(str); + xfree(str); return cx; } /* - * ioWatchDirLoop() Function for watching changes in directory and fire callback + * ioWatchDirLoop() - Function for watching changes in directory and fire callback + * * @csDir = Full directory path * @callback = Callback if raise event! nOp -1 delete, 0 change/move, 1 create * return: -1 error, !=-1 ok, number of total signaled events @@ -549,4 +592,169 @@ ioWatchDirLoop(const char *csDir, int (*callback)(cons close(d); close(kq); return n; +} + +/* + * ioCreatePIDFile() - Create PID file + * + * @csName = PID filename + * @ifExists = !=0 if filename exists return error + * return: -1 error or 0 ok + */ +inline int +ioCreatePIDFile(const char *csName, int ifExists) +{ + int fd; + char str[STRSIZ] = { 0 }; + + if (!csName) + return -1; + + fd = open(csName, O_WRONLY | O_CREAT | (ifExists ? O_EXCL : 0), 0644); + if (fd == -1) { + LOGERR; + return -1; + } + snprintf(str, sizeof str, "%d", getpid()); + write(fd, str, strlen(str)); + close(fd); + return 0; +} + + +/* + * ioSendFile() - AITNET sendfile() userland implementation, not dependant from OS + * + * @s = socket + * @csFile = file for send + * @sendLen = bytes to send, if 0 send all data + * @offset = start file offset + * @sndbuf = SO_SNDBUF value, if 0 use default + * return: 0 error, >0 ok, sended bytes + */ +size_t +ioSendFile(int s, const char *csFile, size_t sendLen, off_t offset, int sndbuf) +{ + void *addr; + int fd; + size_t len = 0; + register size_t off = 0; + + if (!csFile) + return 0; + + if (sndbuf) + if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof sndbuf) == -1) { + LOGERR; + return 0; + } + + fd = open(csFile, O_RDONLY); + if (fd == -1) { + LOGERR; + return 0; + } + if (!sendLen) { + sendLen = lseek(fd, 0, SEEK_END); + if (sendLen == -1) { + LOGERR; + close(fd); + return 0; + } + } + addr = mmap(NULL, sendLen, PROT_READ, MAP_SHARED, fd, offset); + if (addr == MAP_FAILED) { + LOGERR; + close(fd); + return 0; + } else + close(fd); + + while (off < sendLen && (len = write(s, addr + off, sendLen - off)) != -1) + off += len; + if (len == -1) { + LOGERR; + munmap(addr, sendLen); + return 0; + } else + len = off; + + if (len != sendLen) { + io_SetErr(ECANCELED, "Different sizes - request %u bytes, actually sended %u bytes\n", + sendLen, len); + len ^= len; + } + + munmap(addr, sendLen); + return len; +} + +/* + * ioRecvFile() - Receive file from socket, fastest (zero-copy) way + * + * @s = socket + * @csFile = file for receive + * @recvLen = receive bytes + * @over = overwrite file if exists with mode like 0644 + * @rcvbuf = SO_RCVBUF value, if 0 use default + * return: 0 error, >0 ok, received bytes + */ +size_t +ioRecvFile(int s, const char *csFile, size_t recvLen, int over, int rcvbuf) +{ + void *addr; + int fd; + size_t len = 0; + register size_t off = 0; + struct pollfd pfd = { s, POLLIN | POLLPRI, 0 }; + + if (!csFile || !recvLen) + return 0; + if (!over && !access(csFile, F_OK)) + return 0; + + if (rcvbuf) + if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof rcvbuf) == -1) { + LOGERR; + return 0; + } + + fd = open(csFile, O_WRONLY | O_CREAT | O_TRUNC, over); + if (fd == -1) { + LOGERR; + unlink(csFile); + return 0; + } + if (ftruncate(fd, recvLen) == -1) { + LOGERR; + close(fd); + unlink(csFile); + return 0; + } + addr = mmap(NULL, recvLen, PROT_WRITE, MAP_SHARED, fd, 0); + if (addr == MAP_FAILED) { + LOGERR; + close(fd); + unlink(csFile); + return 0; + } else + close(fd); + + while (off < recvLen && poll(&pfd, 1, RECV_TIMEOUT) != -1) + while (off < recvLen && (len = read(s, addr + off, recvLen - off)) != -1) + off += len; + if (len == -1) { + LOGERR; + munmap(addr, recvLen); + unlink(csFile); + return 0; + } else + len = off; + + if (len != recvLen) + io_SetErr(EAGAIN, "Different sizes - request %u bytes, actually received %u bytes\n", + recvLen, len); + + munmap(addr, recvLen); + return len; }