@@ -1,3 +1,13 @@ +2009-03-14 Mikio Hirabayashi <mikio@users.sourceforge.net> + + * ttservctl: configuration was modified and update log is now disabled by default. + + * ttutil.c (ttopensock, ttacceptsock): performance was improved. + + * scrext.c (scrextnew): a parameter for the logger was added. + + - Release: 1.1.18 + 2009-02-19 Mikio Hirabayashi <mikio@users.sourceforge.net> * ttutil.c (tthttpfetch): timeout mechanism was added. ChangeLog @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for tokyotyrant 1.1.17. +# Generated by GNU Autoconf 2.61 for tokyotyrant 1.1.18. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='tokyotyrant' PACKAGE_TARNAME='tokyotyrant' -PACKAGE_VERSION='1.1.17' -PACKAGE_STRING='tokyotyrant 1.1.17' +PACKAGE_VERSION='1.1.18' +PACKAGE_STRING='tokyotyrant 1.1.18' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -1194,7 +1194,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tokyotyrant 1.1.17 to adapt to many kinds of systems. +\`configure' configures tokyotyrant 1.1.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1255,7 +1255,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tokyotyrant 1.1.17:";; + short | recursive ) echo "Configuration of tokyotyrant 1.1.18:";; esac cat <<\_ACEOF @@ -1349,7 +1349,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tokyotyrant configure 1.1.17 +tokyotyrant configure 1.1.18 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1363,7 +1363,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tokyotyrant $as_me 1.1.17, which was +It was created by tokyotyrant $as_me 1.1.18, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1719,7 +1719,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Package information MYLIBVER=3 -MYLIBREV=1 +MYLIBREV=2 MYPROTVER="0.9" # Targets @@ -5912,7 +5912,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by tokyotyrant $as_me 1.1.17, which was +This file was extended by tokyotyrant $as_me 1.1.18, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5955,7 +5955,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -tokyotyrant config.status 1.1.17 +tokyotyrant config.status 1.1.18 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" configure @@ -7,11 +7,11 @@ #================================================================ # Package name -AC_INIT(tokyotyrant, 1.1.17) +AC_INIT(tokyotyrant, 1.1.18) # Package information MYLIBVER=3 -MYLIBREV=1 +MYLIBREV=2 MYPROTVER="0.9" # Targets configure.in @@ -828,7 +828,7 @@ var { <dd>Because an additional zero code is appended at the end of the region of the return value, the return value can be treated as a character string. Because the region of the return value is allocated with the `malloc' call, it should be released with the `free' call when it is no longer in use.</dd> </dl> -<p>The function `tcrdbext2' is used in order to call a function of the script language extension.</p> +<p>The function `tcrdbext2' is used in order to call a function of the script language extension with string parameters.</p> <dl class="api"> <dt><code>char *tcrdbext2(TCRDB *<var>rdb</var>, const char *<var>name</var>, int <var>opts</var>, const char *<var>kstr</var>, const char *<var>vstr</var>);</code></dt> doc/index.html @@ -390,6 +390,17 @@ function mkdir(key, value) end +-- log a string +function log(key, value) + local level = tonumber(value) + if not level then + level = 1 + end + _log(key, level) + return "ok" +end + + -- print a string function hello() print("hello: " .. _time()) ext/senatus.lua @@ -679,7 +679,7 @@ Because an additional zero code is appended at the end of the region of the retu .RE .RE .PP -The function `tcrdbext2' is used in order to call a function of the script language extension. +The function `tcrdbext2' is used in order to call a function of the script language extension with string parameters. .PP .RS .br man/tcrdb.3 @@ -200,6 +200,7 @@ #include <dirent.h> #include <aio.h> #include <netinet/in.h> +#include <netinet/tcp.h> #include <arpa/inet.h> #include <netdb.h> myconf.h @@ -26,7 +26,7 @@ #if defined(TTNOEXT) -typedef struct { // type of structure of logging opaque object +typedef struct { // type of structure of the script extension int thnum; // number of native threads int thid; // thread ID char *path; // path of the initializing script @@ -37,13 +37,14 @@ typedef struct { // type of structure of logging opaque pthread_mutex_t *lcks; // mutex for user locks int lcknum; // number of user locks void (*logger)(int, const char *, void *); // logging function + void *logopq; // opaque pointer for the logging function } SCREXT; /* Initialize the global scripting language extension. */ void *scrextnew(int thnum, int thid, const char *path, TCADB *adb, TCULOG *ulog, uint32_t sid, TCMDB *stash, pthread_mutex_t *lcks, int lcknum, - void (*logger)(int, const char *, void *)){ + void (*logger)(int, const char *, void *), void *logopq){ SCREXT *scr = tcmalloc(sizeof(*scr)); scr->thnum = thnum; scr->thid = thid; @@ -55,6 +56,7 @@ void *scrextnew(int thnum, int thid, const char *path, TCADB *adb, TCULOG *ulog, scr->lcks = lcks; scr->lcknum = lcknum; scr->logger = logger; + scr->logopq = logopq; return scr; } @@ -99,7 +101,7 @@ char *scrextcallmethod(void *scr, const char *name, return tcadbget(myscr->adb, kbuf, ksiz, sp); } else if(!strcmp(name, "log")){ char *msg = tcmemdup(kbuf, ksiz); - myscr->logger(TTLOGINFO, msg, NULL); + myscr->logger(TTLOGINFO, msg, myscr->logopq); tcfree(msg); msg = tcstrdup("ok"); *sp = strlen(msg); @@ -144,7 +146,7 @@ char *scrextcallmethod(void *scr, const char *name, #define SERVVAR "_serv_" // global variable name for server resources #define ITERVAR "_iter_" // global variable name for iterator -typedef struct { // type of structure of logging opaque object +typedef struct { // type of structure of the script extension int thnum; // number of native threads int thid; // thread ID lua_State *lua; // Lua environment @@ -158,6 +160,7 @@ typedef struct { // type of structure of the server data pthread_mutex_t *lcks; // mutex for user locks int lcknum; // number of user locks void (*logger)(int, const char *, void *); // logging function + void *logopq; // opaque pointer for the logging function } SERV; @@ -207,7 +210,7 @@ static int serv_mkdir(lua_State *lua); /* Initialize the global scripting language extension. */ void *scrextnew(int thnum, int thid, const char *path, TCADB *adb, TCULOG *ulog, uint32_t sid, TCMDB *stash, pthread_mutex_t *lcks, int lcknum, - void (*logger)(int, const char *, void *)){ + void (*logger)(int, const char *, void *), void *logopq){ int isiz; char *ibuf = tcreadfile(path, 0, &isiz); if(!ibuf) return NULL; @@ -226,6 +229,7 @@ void *scrextnew(int thnum, int thid, const char *path, TCADB *adb, TCULOG *ulog, serv->lcks = lcks; serv->lcknum = lcknum; serv->logger = logger; + serv->logopq = logopq; lua_setglobal(lua, SERVVAR); lua_register(lua, "_log", serv_log); lua_register(lua, "_put", serv_put); @@ -342,7 +346,7 @@ static void reporterror(lua_State *lua){ char *msg = tcsprintf("Lua error: %s", argc > 0 ? lua_tostring(lua, argc) : "unknown"); lua_getglobal(lua, SERVVAR); SERV *serv = lua_touserdata(lua, -1); - serv->logger(TTLOGERROR, msg, NULL); + serv->logger(TTLOGERROR, msg, serv->logopq); tcfree(msg); } @@ -385,7 +389,7 @@ static int serv_log(lua_State *lua){ if(argc > 1) level = lua_tointeger(lua, 2); lua_getglobal(lua, SERVVAR); SERV *serv = lua_touserdata(lua, -1); - serv->logger(level, msg, NULL); + serv->logger(level, msg, serv->logopq); return 0; } scrext.c @@ -54,10 +54,11 @@ `lcks' specifies the mutex objects for user locks. `lcknum' specifies the number of user locks. `logger' specifies the pointer to a function to do with a log message. + `logopq' specifies the opaque pointer for the logging function. The return value is the scripting object or `NULL' on failure. */ void *scrextnew(int thnum, int thid, const char *path, TCADB *adb, TCULOG *ulog, uint32_t sid, TCMDB *stash, pthread_mutex_t *lcks, int lcknum, - void (*logger)(int, const char *, void *)); + void (*logger)(int, const char *, void *), void *logopq); /* Destroy the scripting language extension. scrext.h @@ -856,7 +856,7 @@ void *tcrdbext(TCRDB *rdb, const char *name, int opts, } -/* Call a function of the scripting language extension. */ +/* Call a function of the scripting language extension with string parameters. */ char *tcrdbext2(TCRDB *rdb, const char *name, int opts, const char *kstr, const char *vstr){ assert(rdb && name && kstr && vstr); int vsiz; tcrdb.c @@ -379,7 +379,7 @@ void *tcrdbext(TCRDB *rdb, const char *name, int opts, const void *kbuf, int ksiz, const void *vbuf, int vsiz, int *sp); -/* Call a function of the scripting language extension. +/* Call a function of the scripting language extension with string parameters. `rdb' specifies the remote database object. `name' specifies the function name. `opts' specifies options by bitwise-or: `RDBXOLCKREC' for record locking, `RDBXOLCKGLB' for tcrdb.h @@ -11,19 +11,23 @@ cmd="ttserver" basedir="/var/ttserver" port="1978" pidfile="$basedir/pid" -logfile="$basedir/log" -ulogdir="$basedir/ulog" -ulimsiz="256m" -sid=1 +#logfile="$basedir/log" +#ulogdir="$basedir/ulog" +#ulimsiz="256m" +#sid=1 +#mhost="remotehost1" +#mport="1978" +#rtsfile="$basedir/rts" dbname="$basedir/casket.tch#bnum=1000000" maxcon="65536" retval=0 -# locale clear +# setting environment variables LANG=C LC_ALL=C -export LANG LC_ALL +PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin" +export LANG LC_ALL PATH # start the server @@ -31,20 +35,43 @@ start(){ printf 'Starting the server of Tokyo Tyrant\n' ulimit -n "$maxcon" mkdir -p "$basedir" - if [ -f "$pidfile" ] ; then + if [ -z "$basedir" ] || [ -z "$port" ] || [ -z "$pidfile" ] || [ -z "$dbname" ] ; then + printf 'Invalid configuration\n' + retval=1 + elif ! [ -d "$basedir" ] ; then + printf 'No such directory: %s\n' "$basedir" + retval=1 + elif [ -f "$pidfile" ] ; then pid=`cat "$pidfile"` printf 'Existing process: %d\n' "$pid" retval=1 else - $cmd \ - -port "$port" \ - -dmn \ - -pid "$pidfile" \ - -log "$logfile" \ - -ulog "$ulogdir" \ - -ulim "$ulimsiz" \ - -sid "$sid" \ - "$dbname" + cmd="$cmd -port $port -dmn -pid $pidfile" + if [ -n "$logfile" ] ; then + cmd="$cmd -log $logfile" + fi + if [ -n "$ulogdir" ] ; then + mkdir -p "$ulogdir" + cmd="$cmd -ulog $ulogdir" + fi + if [ -n "$ulimsiz" ] ; then + cmd="$cmd -ulim $ulimsiz" + fi + if [ -n "$sid" ] ; then + cmd="$cmd -sid $sid" + fi + if [ -n "$mhost" ] ; then + cmd="$cmd -mhost $mhost" + fi + if [ -n "$mport" ] ; then + cmd="$cmd -mport $mport" + fi + if [ -n "$rtsfile" ] ; then + cmd="$cmd -rts $rtsfile" + fi + printf "Executing: %s\n" "$cmd" + cmd="$cmd $dbname" + $cmd if [ "$?" -eq 0 ] ; then printf 'Done\n' else @@ -60,6 +87,7 @@ stop(){ printf 'Stopping the server of Tokyo Tyrant\n' if [ -f "$pidfile" ] ; then pid=`cat "$pidfile"` + printf "Sending the terminal signal to the process: %s\n" "$pid" kill -TERM "$pid" c=0 while true ; do @@ -67,7 +95,7 @@ stop(){ if [ -f "$pidfile" ] ; then c=`expr $c + 1` if [ "$c" -ge 100 ] ; then - printf 'Hunging process: %d\n' "$pid" + printf 'Hanging process: %d\n' "$pid" retval=1 break fi @@ -88,6 +116,7 @@ hup(){ printf 'Sending HUP signal to the server of Tokyo Tyrant\n' if [ -f "$pidfile" ] ; then pid=`cat "$pidfile"` + printf "Sending the hangup signal to the process: %s\n" "$pid" kill -HUP "$pid" printf 'Done\n' else ttservctl @@ -538,7 +538,7 @@ static int proc(const char *dbname, const char *host, int port, int thnum, int t bool screrr = false; for(int i = 0; i < thnum; i++){ screxts[i] = scrextnew(thnum, i, extpath, adb, ulog, sid, scrstash, - scrlcks, RECMTXNUM, do_log); + scrlcks, RECMTXNUM, do_log, &larg); if(!screxts[i]) screrr = true; } if(screrr){ @@ -578,7 +578,7 @@ static int proc(const char *dbname, const char *host, int port, int thnum, int t pcarg->sid = sid; pcarg->sarg = &sarg; pcarg->scrext = scrextnew(thnum, thnum + i, extpath, adb, ulog, sid, scrstash, - scrlcks, RECMTXNUM, do_log); + scrlcks, RECMTXNUM, do_log, &larg); if(pcarg->scrext){ if(*name && period > 0) ttservaddtimedhandler(g_serv, period, do_extpc, pcarg); } else { ttserver.c @@ -105,6 +105,8 @@ int ttopensock(const char *addr, int port){ opttv.tv_sec = (int)SOCKSNDTIMEO; opttv.tv_usec = (SOCKSNDTIMEO - (int)SOCKSNDTIMEO) * 1000000; setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char *)&opttv, sizeof(opttv)); + int optint = 1; + setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&optint, sizeof(optint)); return fd; } @@ -196,6 +198,8 @@ int ttacceptsock(int fd, char *addr, int *pp){ opttv.tv_sec = (int)SOCKSNDTIMEO; opttv.tv_usec = (SOCKSNDTIMEO - (int)SOCKSNDTIMEO) * 1000000; setsockopt(cfd, SOL_SOCKET, SO_SNDTIMEO, (char *)&opttv, sizeof(opttv)); + int optint = 1; + setsockopt(cfd, IPPROTO_TCP, TCP_NODELAY, (char *)&optint, sizeof(optint)); if(addr){ if(getnameinfo((struct sockaddr *)&sain, sizeof(sain), addr, TTADDRBUFSIZ, NULL, 0, NI_NUMERICHOST) != 0) sprintf(addr, "0.0.0.0"); ttutil.c @@ -419,8 +419,8 @@ bool ttserviskilled(TTSERV *serv); *************************************************************************************************/ -#define _TT_VERSION "1.1.17" -#define _TT_LIBVER 301 +#define _TT_VERSION "1.1.18" +#define _TT_LIBVER 302 #define _TT_PROTVER "0.9" ttutil.h 264d1c6ce065031ca27a0b1176b0507dd1a185e3 Bob Ippolito bob@redivi.com http://github.com/etrepum/tokyo-tyrant/commit/32d8bca0f18a89e4c329c8dcaa5ac867f902e9b1 32d8bca0f18a89e4c329c8dcaa5ac867f902e9b1 2009-03-23T15:03:16-07:00 2009-03-23T15:03:16-07:00 sync with tokyotyrant-1.1.18.tar.gz 476750e899d0c6693c1905ce199a78f9bc9d68f8 Bob Ippolito bob@redivi.com