August 2007 - jbossnative-commits

JBoss Native SVN: r958 - trunk/sight/native/os/linux.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-08-30 05:22:15 -0400 (Thu, 30 Aug 2007) New Revision: 958 Modified: trunk/sight/native/os/linux/console.c Log: Adding Linux Console implementation Modified: trunk/sight/native/os/linux/console.c =================================================================== --- trunk/sight/native/os/linux/console.c 2007-08-29 11:33:18 UTC (rev 957) +++ trunk/sight/native/os/linux/console.c 2007-08-30 09:22:15 UTC (rev 958) @@ -34,17 +34,213 @@ #include "sight_types.h" #include "sight_private.h" +/* If unistd.h defines _POSIX_VERSION, we conclude that we + * are on a POSIX system and have sigaction and termios. */ +#if defined(_POSIX_VERSION) + +# define SIGACTION +# if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY) +# define TERMIOS +# endif +#endif + +/* There are 5 types of terminal interface supported, + * TERMIO, TERMIOS, VMS, MSDOS and SGTTY + */ + +#if defined(__sgi) && !defined(TERMIOS) +# define TERMIOS +# undef TERMIO +# undef SGTTY +#endif + +#if defined(linux) && !defined(TERMIO) +# undef TERMIOS +# define TERMIO +# undef SGTTY +#endif + +#ifdef _LIBC +# undef TERMIOS +# define TERMIO +# undef SGTTY +#endif + +#if !defined(TERMIO) && !defined(TERMIOS) +# undef TERMIOS +# undef TERMIO +# define SGTTY +#endif + +#ifdef TERMIOS +# include <termios.h> +# define TTY_STRUCT struct termios +# define TTY_FLAGS c_lflag +# define TTY_get(tty,data) tcgetattr(tty,data) +# define TTY_set(tty,data) tcsetattr(tty,TCSANOW,data) +#endif + +#ifdef TERMIO +# include <termio.h> +# define TTY_STRUCT struct termio +# define TTY_FLAGS c_lflag +# define TTY_get(tty,data) ioctl(tty,TCGETA,data) +# define TTY_set(tty,data) ioctl(tty,TCSETA,data) +#endif + +#ifdef SGTTY +# include <sgtty.h> +# define TTY_STRUCT struct sgttyb +# define TTY_FLAGS sg_flags +# define TTY_get(tty,data) ioctl(tty,TIOCGETP,data) +# define TTY_set(tty,data) ioctl(tty,TIOCSETP,data) +#endif + +#if !defined(_LIBC) +# include <sys/ioctl.h> +#endif + +#ifndef NX509_SIG +# define NX509_SIG 32 +#endif + + +/* Define globals. They are protected by a lock */ +#ifdef SIGACTION +static struct sigaction savsig[NX509_SIG]; +#else +static void (*savsig[NX509_SIG])(int ); +#endif + +#define DEV_TTY "/dev/tty" + +static TTY_STRUCT tty_orig; +static TTY_STRUCT tty_new; + +static FILE *tty_in; +static FILE *tty_out; +static int is_a_tty; + +static volatile sig_atomic_t intr_signal; + +static void recsig(int i) +{ + intr_signal = i; +} + + +/* Internal functions to handle signals and act on them */ +static void pushsig(void) +{ + int i; +#ifdef SIGACTION + struct sigaction sa; + + memset(&sa, 0, sizeof sa); + sa.sa_handler = recsig; +#endif + + for (i = 1; i < NX509_SIG; i++) { +#ifdef SIGUSR1 + if (i == SIGUSR1) + continue; +#endif +#ifdef SIGUSR2 + if (i == SIGUSR2) + continue; +#endif +#ifdef SIGKILL + if (i == SIGKILL) /* We can't make any action on that. */ + continue; +#endif +#ifdef SIGACTION + sigaction(i, &sa, &savsig[i]); +#else + savsig[i] = signal(i, recsig); +#endif + } + +#ifdef SIGWINCH + signal(SIGWINCH, SIG_DFL); +#endif +} + +static void popsig(void) +{ + int i; + + for (i = 1; i < NX509_SIG; i++) { +#ifdef SIGUSR1 + if (i == SIGUSR1) + continue; +#endif +#ifdef SIGUSR2 + if (i == SIGUSR2) + continue; +#endif +#ifdef SIGACTION + sigaction(i, &savsig[i], NULL); +#else + signal(i, savsig[i]); +#endif + } +} + +typedef struct { + FILE *coni; + FILE *cono; + TTY_STRUCT ttyo; + TTY_STRUCT ttyn; + int is_a_tty; +} sight_console_t; + SIGHT_EXPORT_DECLARE(jlong, Console, alloc0)(SIGHT_STDARGS) { - UNREFERENCED_STDARGS; - return 0; + sight_console_t *con; + UNREFERENCED_O; + + if (!(con = (sight_console_t *)calloc(1, sizeof(sight_console_t)))) { + throwAprMemoryException(_E, THROW_FMARK, + apr_get_os_error()); + return 0; + } + return P2J(con); } SIGHT_EXPORT_DECLARE(void, Console, open0)(SIGHT_STDARGS, jlong instance) { + sight_console_t *con = J2P(instance, sight_console_t *); UNREFERENCED_STDARGS; - UNREFERENCED(instance); + + if (!con) + return; + con->is_a_tty = 1; + if ((con->coni = fopen(DEV_TTY,"r")) == NULL) + con->coni = stdin; + if ((con->cono = fopen(DEV_TTY,"r")) == NULL) + con->cono = stdout; + + if (TTY_get(fileno(con->coni), &con->ttyo) == -1) { +#ifdef ENOTTY + if (errno == ENOTTY) + con->is_a_tty = 0; + else +#endif +#ifdef EINVAL + /* Ariel Glenn ariel(a)columbia.edu reports that solaris + * can return EINVAL instead. This should be ok + */ + if (errno == EINVAL) + con->is_a_tty = 0; + else +#endif + { + /* TODO: Trow an exception ? */ + return; + } + } + } SIGHT_EXPORT_DECLARE(jint, Console, attach0)(SIGHT_STDARGS, @@ -58,16 +254,40 @@ SIGHT_EXPORT_DECLARE(void, Console, close0)(SIGHT_STDARGS, jlong instance) { + sight_console_t *con = J2P(instance, sight_console_t *); + UNREFERENCED_STDARGS; + + if (!con) + return; + if (con->coni != stdin) + fclose(con->coni); + if (con->cono != stdout) + fclose(con->cono); + free(con); } SIGHT_EXPORT_DECLARE(void, Console, echo0)(SIGHT_STDARGS, jlong instance, jboolean on) { + sight_console_t *con = J2P(instance, sight_console_t *); UNREFERENCED_STDARGS; - UNREFERENCED(instance); - UNREFERENCED(on); + +#ifdef TTY_FLAGS + memcpy(&(con->ttyn), &(con->ttyo), sizeof(con->ttyo)); + if (on) + con->ttyn.TTY_FLAGS |= ECHO; + else + con->ttyn.TTY_FLAGS &= ~ECHO; +#endif + +#if defined(TTY_set) + if (con->is_a_tty && (TTY_set(fileno(con->coni), &(con->ttyn)) == -1)) { + return; + } +#endif + } SIGHT_EXPORT_DECLARE(void, Console, stitle0)(SIGHT_STDARGS, @@ -93,16 +313,16 @@ SIGHT_EXPORT_DECLARE(jstring, Console, gets0)(SIGHT_STDARGS, jlong instance) { + sight_console_t *con = J2P(instance, sight_console_t *); UNREFERENCED_STDARGS; - UNREFERENCED(instance); return NULL; } SIGHT_EXPORT_DECLARE(jint, Console, getc0)(SIGHT_STDARGS, jlong instance) { + sight_console_t *con = J2P(instance, sight_console_t *); UNREFERENCED_STDARGS; - UNREFERENCED(instance); return -1; } @@ -110,25 +330,34 @@ jlong instance, jint ch) { + sight_console_t *con = J2P(instance, sight_console_t *); UNREFERENCED_STDARGS; - UNREFERENCED(instance); - UNREFERENCED(ch); + if (con->cono) { + fputc(ch, con->cono); + } } SIGHT_EXPORT_DECLARE(void, Console, flush0)(SIGHT_STDARGS, jlong instance) { + sight_console_t *con = J2P(instance, sight_console_t *); + if (con->cono) + fflush(con->cono); UNREFERENCED_STDARGS; - UNREFERENCED(instance); } SIGHT_EXPORT_DECLARE(void, Console, puts0)(SIGHT_STDARGS, jlong instance, jstring str) { - UNREFERENCED_STDARGS; - UNREFERENCED(instance); - UNREFERENCED(str); + sight_console_t *con = J2P(instance, sight_console_t *); + SIGHT_ALLOC_CSTRING(str); + + UNREFERENCED_O; + if (con->cono) { + fputs(J2S(str), con->cono); + } + SIGHT_FREE_CSTRING(str); }

17 years, 3 months

1
0
0 / 0

JBoss Native SVN: r957 - trunk/httpd/src/native/mod_manager.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-29 07:33:18 -0400 (Wed, 29 Aug 2007) New Revision: 957 Added: trunk/httpd/src/native/mod_manager/mod_manager.c Log: Just add a missing file. Added: trunk/httpd/src/native/mod_manager/mod_manager.c =================================================================== --- trunk/httpd/src/native/mod_manager/mod_manager.c (rev 0) +++ trunk/httpd/src/native/mod_manager/mod_manager.c 2007-08-29 11:33:18 UTC (rev 957) @@ -0,0 +1,173 @@ +/* + Copyright 2007 Red Hat Middleware, LLC. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed + under the License is distributed on an "AS IS" BASIS,i + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +#include "apr_strings.h" + +#include "httpd.h" +#include "http_config.h" +#include "http_log.h" +#include "http_main.h" +#include "http_request.h" +#include "http_protocol.h" + +#include "node.h" + +/* shared memory */ +mem_t *contextstatsmem = NULL; +mem_t *nodesstatsmem = NULL; + +struct mod_manager_config +{ + /* base name for the shared memory */ + char *basefilename = NULL; + /* max number of context supported */ + int maxcontext = 100; + /* max munber of node supported */ + int maxnode = 10; + /* enablePort */ + int enable; + +}; + + +/* + * call after parser the configuration. + * create the shared memory. + * XXX: add some code there + */ +static int manager_init(apr_pool_t *p, apr_pool_t *plog, + apr_pool_t *ptemp, server_rec *s) +{ + char *node; + char *context; + if (basefilename) { + node = apr_pstrcat(ptemp, basefilename, ".node", NULL); + context = apr_pstrcat(ptemp, basefilename, ".context", NULL); + } else { + node = "manager.node"; + context = "manager.context"; + } + nodestatsmem = create_mem_node(node, maxnode, p); + if (nodestatsmem == NULL) { + ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, "create_mem_node failed"); + return !OK; + } + /* XXX: need the context logic + contextstatsmem = create_mem_context(node, maxcontext, p); + if (contextstatsmem == NULL) { + ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, "create_mem_context failed"); + return !OK; + } + */ + return OK; +} +static ftp_process_connection(conn_rec *c) +{ + ftp_server_config *mconf = ap_get_module_config(c->base_server->module_config, &manager_module); + apr_socket_t *client_socket = ap_get_module_config(c->conn_config, &core_module); + + if (!mconf->enabled) { + return DECLINED; + } +} + +/* + * Supported directives. + */ +AP_DECLARE_NONSTD(const char *) cmd_manager_maxcontext(cmd_parms *cmd, void *mconfig, const char *word) +{ + mod_manager_config *mconf = ap_get_module_config(cmd->server->module_config, &manager_module); + mconf->maxcontext = atoi(word); + return NULL; +} +AP_DECLARE_NONSTD(const char *) cmd_manager_maxnode(cmd_parms *cmd, void *mconfig, const char *word) +{ + mod_manager_config *mconf = ap_get_module_config(cmd->server->module_config, &manager_module); + mconf->maxnode = atoi(word); + return NULL; +} +AP_DECLARE_NONSTD(const char *) cmd_manager_memmanagerfile(cmd_parms *cmd, void *mconfig, const char *word) +{ + mod_manager_config *mconf = ap_get_module_config(cmd->server->module_config, &manager_module); + mconf->basefilename = apr_pstrdup(cmd->pool, word); + return NULL; +} +AP_DECLARE_NONSTD(const char *) cmd_manager_enablePort(cmd_parms *cmd, void *mconfig, int arg) +{ + mod_manager_config *mconf = ap_get_module_config(cmd->server->module_config, &manager_module); + mconf->enable = arg; + return NULL; +} +static const command_rec manager_cmds[] = +{ + AP_INIT_TAKE1( + "Maxcontext", + cmd_manager_maxcontext, + NULL, + OR_ALL, + "Maxcontext - number max context support by mod_manager" + ), + AP_INIT_TAKE1( + "Maxnode", + cmd_manager_maxnode, + NULL, + OR_ALL, + "Maxnode - number max node support by mod_manager" + ), + AP_INIT_TAKE1( + "MemManagerFile", + cmd_manager_memmanagerfile, + NULL, + OR_ALL, + "MemManagerFile - base name of the files used to create/attach to shared memory" + ), + AP_INIT_FLAG("EnableLocalPort", + cmd_manager_enablePort, + NULL, + RSRC_CONF, + "Run a TCP receivert on this host"), + {NULL} +}; + +/* hooks declaration */ + +static void manager_hooks(apr_pool_t *p) +{ + + /* Create the shared tables for mod_proxy_cluster */ + ap_hook_post_config(manager_init, NULL, NULL, APR_HOOK_MIDDLE); + + /* Process the connections from jboss nodes */ + ap_hook_process_connection(manager_process_connection, NULL, NULL, APR_HOOK_MIDDLE); +} + +/* + * Config creation stuff + */ +static void *manager_config(apr_pool_t *pool, char *x) +{ + return NULL; +} + +/* Module declaration */ + +module AP_MODULE_DECLARE_DATA manager_module = { + STANDARD20_MODULE_STUFF, + manager_config, + NULL, + NULL, + NULL, + manager_cmds, /* command table */ + manager_hooks /* register hooks */ +};

17 years, 3 months

1
0
0 / 0

JBoss Native SVN: r956 - trunk/sight/native/share.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-08-29 03:50:03 -0400 (Wed, 29 Aug 2007) New Revision: 956 Modified: trunk/sight/native/share/dir.c Log: Fix garbage collected objects for opened directories. The original APR pool callback will close the directory Modified: trunk/sight/native/share/dir.c =================================================================== --- trunk/sight/native/share/dir.c 2007-08-23 15:49:57 UTC (rev 955) +++ trunk/sight/native/share/dir.c 2007-08-29 07:50:03 UTC (rev 956) @@ -34,7 +34,12 @@ static void dir_cleanup(int mode, sight_object_t *no) { - if (no && no->native) { + /* + * In case this is a pool callback do not + * close the directory. It will be closed + * by the original apr pool callback + */ + if (mode != POOL_CALLBACK && no && no->native) { apr_dir_close((apr_dir_t *)no->native); no->native = NULL; }

17 years, 3 months

1
0
0 / 0

JBoss Native SVN: r955 - trunk/sight/native/os/solaris.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-23 11:49:57 -0400 (Thu, 23 Aug 2007) New Revision: 955 Added: trunk/sight/native/os/solaris/console.c Log: return This function has not been implemented on this platform like in Linux. Added: trunk/sight/native/os/solaris/console.c =================================================================== --- trunk/sight/native/os/solaris/console.c (rev 0) +++ trunk/sight/native/os/solaris/console.c 2007-08-23 15:49:57 UTC (rev 955) @@ -0,0 +1,148 @@ +/* + * SIGHT - System information gathering hybrid tool + * + * Copyright(c) 2007 Red Hat Middleware, LLC, + * and individual contributors as indicated by the @authors tag. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library in the file COPYING.LIB; + * if not, write to the Free Software Foundation, Inc., + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * @author Mladen Turk + * + */ + +/** + * Console implementation + * + */ +#include "sight.h" +#include "sight_local.h" +#include "sight_types.h" +#include "sight_private.h" + +SIGHT_EXPORT_DECLARE(jlong, Console, alloc0)(SIGHT_STDARGS) +{ + UNREFERENCED_STDARGS; + return 0; +} + +SIGHT_EXPORT_DECLARE(void, Console, open0)(SIGHT_STDARGS, + jlong instance) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(instance); +} + +SIGHT_EXPORT_DECLARE(jint, Console, attach0)(SIGHT_STDARGS, + jint pid) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(pid); + return APR_ENOTIMPL; +} + +SIGHT_EXPORT_DECLARE(void, Console, close0)(SIGHT_STDARGS, + jlong instance) +{ + UNREFERENCED_STDARGS; +} + +SIGHT_EXPORT_DECLARE(void, Console, echo0)(SIGHT_STDARGS, + jlong instance, + jboolean on) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(instance); + UNREFERENCED(on); +} + +SIGHT_EXPORT_DECLARE(void, Console, stitle0)(SIGHT_STDARGS, + jstring title) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(title); +} + +SIGHT_EXPORT_DECLARE(jstring, Console, gtitle0)(SIGHT_STDARGS) +{ + UNREFERENCED_O; + return (*_E)->NewStringUTF(_E, "Unknown"); +} + +SIGHT_EXPORT_DECLARE(void, Console, kill3)(SIGHT_STDARGS) +{ + + UNREFERENCED_STDARGS; +} + + +SIGHT_EXPORT_DECLARE(jstring, Console, gets0)(SIGHT_STDARGS, + jlong instance) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(instance); + return NULL; +} + +SIGHT_EXPORT_DECLARE(jint, Console, getc0)(SIGHT_STDARGS, + jlong instance) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(instance); + return -1; +} + +SIGHT_EXPORT_DECLARE(void, Console, putc0)(SIGHT_STDARGS, + jlong instance, + jint ch) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(instance); + UNREFERENCED(ch); +} + +SIGHT_EXPORT_DECLARE(void, Console, flush0)(SIGHT_STDARGS, + jlong instance) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(instance); +} + +SIGHT_EXPORT_DECLARE(void, Console, puts0)(SIGHT_STDARGS, + jlong instance, + jstring str) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(instance); + UNREFERENCED(str); +} + + +SIGHT_EXPORT_DECLARE(jint, Console, denable0)(SIGHT_STDARGS, + jlong instance) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(instance); + return APR_ENOTIMPL; +} + +SIGHT_EXPORT_DECLARE(void, Console, ddisable0)(SIGHT_STDARGS, + jlong instance) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(instance); +}

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r954 - trunk/sight/native/os/posix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-23 11:21:12 -0400 (Thu, 23 Aug 2007) New Revision: 954 Modified: trunk/sight/native/os/posix/group.c trunk/sight/native/os/posix/user.c Log: The fields are "J" so use SET_IFIELD_J and cast (jlong). Modified: trunk/sight/native/os/posix/group.c =================================================================== --- trunk/sight/native/os/posix/group.c 2007-08-21 09:57:19 UTC (rev 953) +++ trunk/sight/native/os/posix/group.c 2007-08-23 15:21:12 UTC (rev 954) @@ -164,7 +164,7 @@ /* 3. GID */ token = sight_strtok_c(NULL, ':', &titer); ng->gid = sight_strtoi32(token); - SET_IFIELD_I(0002, u, ng->gid); + SET_IFIELD_J(0002, u, (jlong) ng->gid); SET_IFIELD_Z(0003, u, JNI_TRUE); /* 4. Users */ token = sight_strtok_c(NULL, ':', &titer); @@ -222,7 +222,7 @@ } grp->gid = grpid; SET_IFIELD_S(0000, thiz, gname); - SET_IFIELD_I(0002, thiz, grp->gid); + SET_IFIELD_J(0002, thiz, (jlong) grp->gid); SET_IFIELD_Z(0003, thiz, JNI_TRUE); /* 4. Users */ token = sight_strtok_c(NULL, ':', &titer); Modified: trunk/sight/native/os/posix/user.c =================================================================== --- trunk/sight/native/os/posix/user.c 2007-08-21 09:57:19 UTC (rev 953) +++ trunk/sight/native/os/posix/user.c 2007-08-23 15:21:12 UTC (rev 954) @@ -164,7 +164,7 @@ /* 3. UID */ token = sight_strtok_c(NULL, ':', &titer); nu->uid = sight_strtoi32(token); - SET_IFIELD_I(0003, u, nu->uid); + SET_IFIELD_J(0003, u, (jlong) nu->uid); /* 4. GID */ token = sight_strtok_c(NULL, ':', &titer); nu->gid = sight_strtoi32(token); @@ -215,7 +215,7 @@ usr = (posix_user_t *)malloc(sizeof(posix_user_t)); usr->uid = uid; SET_IFIELD_S(0000, thiz, uname); - SET_IFIELD_I(0003, thiz, usr->uid); + SET_IFIELD_J(0003, thiz, (jlong) usr->uid); /* 4. GID */ token = sight_strtok_c(NULL, ':', &titer); usr->gid = sight_strtoi32(token);

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r953 - in trunk/sight/native: os/linux and 2 other directories.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-21 05:57:19 -0400 (Tue, 21 Aug 2007) New Revision: 953 Modified: trunk/sight/native/include/sight_types.h trunk/sight/native/os/linux/tcpstat.c trunk/sight/native/os/linux/udpstat.c trunk/sight/native/os/posix/group.c trunk/sight/native/os/posix/user.c trunk/sight/native/share/jnu.c Log: The union in sight_arr_t needs to have a name otherwise it won't compile on Solaris compiler (and lot others). Modified: trunk/sight/native/include/sight_types.h =================================================================== --- trunk/sight/native/include/sight_types.h 2007-08-21 09:41:21 UTC (rev 952) +++ trunk/sight/native/include/sight_types.h 2007-08-21 09:57:19 UTC (rev 953) @@ -106,7 +106,7 @@ union { char **ca; jchar **wa; - }; + } arr; } sight_arr_t; typedef struct sight_object_t sight_object_t; Modified: trunk/sight/native/os/linux/tcpstat.c =================================================================== --- trunk/sight/native/os/linux/tcpstat.c 2007-08-21 09:41:21 UTC (rev 952) +++ trunk/sight/native/os/linux/tcpstat.c 2007-08-21 09:57:19 UTC (rev 953) @@ -174,9 +174,9 @@ /* Get the information corresponding to the second entry Tcp: */ for (i = 0; i < tgrp->siz; i++) { - if (memcmp(tgrp->ca[i], "Tcp:", 4) == 0) { - if (memcmp(tgrp->ca[i], "Tcp: RtoAlgorithm", 17) != 0) { - sscanf(tgrp->ca[i], "Tcp: %d %d %d %d %d %d %d %d %d %d %d %d %d %d", + if (memcmp(tgrp->arr.ca[i], "Tcp:", 4) == 0) { + if (memcmp(tgrp->arr.ca[i], "Tcp: RtoAlgorithm", 17) != 0) { + sscanf(tgrp->arr.ca[i], "Tcp: %d %d %d %d %d %d %d %d %d %d %d %d %d %d", &RtoAlgorithm, &RtoMin, &RtoMax, &MaxConn, &ActiveOpens, &PassiveOpens, &AttemptFails, &EstabResets, &CurrEstab, &InSegs, &OutSegs, &RetransSegs, &InErrs, &OutRsts); Modified: trunk/sight/native/os/linux/udpstat.c =================================================================== --- trunk/sight/native/os/linux/udpstat.c 2007-08-21 09:41:21 UTC (rev 952) +++ trunk/sight/native/os/linux/udpstat.c 2007-08-21 09:57:19 UTC (rev 953) @@ -111,9 +111,9 @@ /* Get the information corresponding to the second entry Tcp: */ for (i = 0; i < tgrp->siz; i++) { - if (memcmp(tgrp->ca[i], "Udp:", 4) == 0) { - if (memcmp(tgrp->ca[i], "Udp: InDatagrams", 16) != 0) { - sscanf(tgrp->ca[i], "Udp: %d %d %d %d %d %d", + if (memcmp(tgrp->arr.ca[i], "Udp:", 4) == 0) { + if (memcmp(tgrp->arr.ca[i], "Udp: InDatagrams", 16) != 0) { + sscanf(tgrp->arr.ca[i], "Udp: %d %d %d %d %d %d", &InDatagrams, &NoPorts, &InErrors, &OutDatagrams, &RcvbufErrors, &SndbufErrors); break; Modified: trunk/sight/native/os/posix/group.c =================================================================== --- trunk/sight/native/os/posix/group.c 2007-08-21 09:41:21 UTC (rev 952) +++ trunk/sight/native/os/posix/group.c 2007-08-21 09:57:19 UTC (rev 953) @@ -157,7 +157,7 @@ goto cleanup; } /* 1. GroupName */ - token = sight_strtok_c(tgrp->ca[i], ':', &titer); + token = sight_strtok_c(tgrp->arr.ca[i], ':', &titer); SET_IFIELD_S(0000, u, token); /* 2. Password */ token = sight_strtok_c(NULL, ':', &titer); @@ -208,7 +208,7 @@ char *titer; /* 1. GroupName */ - gname = sight_strtok_c(tgrp->ca[i], ':', &titer); + gname = sight_strtok_c(tgrp->arr.ca[i], ':', &titer); /* 2. Password */ token = sight_strtok_c(NULL, ':', &titer); /* 3. GID */ Modified: trunk/sight/native/os/posix/user.c =================================================================== --- trunk/sight/native/os/posix/user.c 2007-08-21 09:41:21 UTC (rev 952) +++ trunk/sight/native/os/posix/user.c 2007-08-21 09:57:19 UTC (rev 953) @@ -157,7 +157,7 @@ goto cleanup; } /* 1. UserName */ - token = sight_strtok_c(tusr->ca[i], ':', &titer); + token = sight_strtok_c(tusr->arr.ca[i], ':', &titer); SET_IFIELD_S(0000, u, token); /* 2. Password */ token = sight_strtok_c(NULL, ':', &titer); @@ -205,7 +205,7 @@ char *titer; /* 1. UserName */ - uname = sight_strtok_c(tusr->ca[i], ':', &titer); + uname = sight_strtok_c(tusr->arr.ca[i], ':', &titer); /* 2. Password */ token = sight_strtok_c(NULL, ':', &titer); /* 3. UID */ Modified: trunk/sight/native/share/jnu.c =================================================================== --- trunk/sight/native/share/jnu.c 2007-08-21 09:41:21 UTC (rev 952) +++ trunk/sight/native/share/jnu.c 2007-08-21 09:57:19 UTC (rev 953) @@ -702,7 +702,7 @@ return NULL; a->siz = 0; a->len = init; - if (!(a->ca = (char **)malloc(init * sizeof(char *)))) { + if (!(a->arr.ca = (char **)malloc(init * sizeof(char *)))) { int saved = errno; free(a); a = NULL; @@ -716,18 +716,18 @@ if (!str || !*str) return 0; /* Skip empty and null strings */ if (a->siz < a->len) { - a->ca[a->siz++] = strdup(str); + a->arr.ca[a->siz++] = strdup(str); } else { char **na; size_t len = a->len << 2; if (!(na = (char **)malloc(len * sizeof(char *)))) return errno; - memcpy(na, a->ca, a->siz * sizeof(char *)); - free(a->ca); + memcpy(na, a->arr.ca, a->siz * sizeof(char *)); + free(a->arr.ca); a->len = len; - a->ca = na; - a->ca[a->siz++] = strdup(str); + a->arr.ca = na; + a->arr.ca[a->siz++] = strdup(str); } return 0; } @@ -739,9 +739,9 @@ if (!a) return; for (i = 0; i < a->siz; i++) { - SIGHT_FREE(a->ca[i]); + SIGHT_FREE(a->arr.ca[i]); } - free(a->ca); + free(a->arr.ca); free(a); }

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r952 - trunk/sight/native/share.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-21 05:41:21 -0400 (Tue, 21 Aug 2007) New Revision: 952 Modified: trunk/sight/native/share/jnu.c Log: prevents: "share/jnu.c", line 52: warning: statement not reached "share/jnu.c", line 469: warning: statement not reached Modified: trunk/sight/native/share/jnu.c =================================================================== --- trunk/sight/native/share/jnu.c 2007-08-21 09:38:41 UTC (rev 951) +++ trunk/sight/native/share/jnu.c 2007-08-21 09:41:21 UTC (rev 952) @@ -46,8 +46,6 @@ return SIGHT_BENDIAN; case 4: return SIGHT_LENDIAN; - default: - return 0; } return 0; } @@ -461,8 +459,6 @@ else return SIGHT_FS_UNKNOWN; break; - default: - return SIGHT_FS_UNKNOWN; } /* NOTREACHED */

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r951 - in trunk/sight/native: share and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-21 05:38:41 -0400 (Tue, 21 Aug 2007) New Revision: 951 Modified: trunk/sight/native/include/sight_types.h trunk/sight/native/share/hash.c trunk/sight/native/share/jnu.c Log: The union in sight_str_t needs to have a name otherwise it won't compile on Solaris compiler (and lot others). Modified: trunk/sight/native/include/sight_types.h =================================================================== --- trunk/sight/native/include/sight_types.h 2007-08-20 10:33:32 UTC (rev 950) +++ trunk/sight/native/include/sight_types.h 2007-08-21 09:38:41 UTC (rev 951) @@ -93,7 +93,7 @@ union { char *c; jchar *w; - }; + } str; } sight_str_t; #define SIGHT_ARR_CCHAR 0x01000000 Modified: trunk/sight/native/share/hash.c =================================================================== --- trunk/sight/native/share/hash.c 2007-08-20 10:33:32 UTC (rev 950) +++ trunk/sight/native/share/hash.c 2007-08-21 09:38:41 UTC (rev 951) @@ -77,7 +77,7 @@ { sight_str_t rv; rv.len = 0; - rv.c = (char *)apr_table_get(table, key); + rv.str.c = (char *)apr_table_get(table, key); return rv; } Modified: trunk/sight/native/share/jnu.c =================================================================== --- trunk/sight/native/share/jnu.c 2007-08-20 10:33:32 UTC (rev 950) +++ trunk/sight/native/share/jnu.c 2007-08-21 09:38:41 UTC (rev 951) @@ -184,7 +184,7 @@ const jchar *p = s; str.len = 0; - str.w = NULL; + str.str.w = NULL; if (p == NULL) { return str; } @@ -192,9 +192,9 @@ siz += sizeof(jchar); str.len++; } - str.w = calloc(1, siz); - if (str.w && str.len) - memcpy(str.w, s, str.len * sizeof(jchar)); + str.str.w = calloc(1, siz); + if (str.str.w && str.len) + memcpy(str.str.w, s, str.len * sizeof(jchar)); return str; }

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r950 - in trunk/sight: native and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-20 06:33:32 -0400 (Mon, 20 Aug 2007) New Revision: 950 Removed: trunk/sight/native/README Modified: trunk/sight/README.txt Log: Arrange READMEs. Modified: trunk/sight/README.txt =================================================================== --- trunk/sight/README.txt 2007-08-20 10:16:34 UTC (rev 949) +++ trunk/sight/README.txt 2007-08-20 10:33:32 UTC (rev 950) @@ -6,8 +6,3 @@ ======== ant To build the native part see native/BUILDING - -Running the examples -==================== -before running the examples you may have to set LD_LIBRARY_PATH, something like -LD_LIBRARY_PATH=/opt/SMAWoIS/openssl/lib; export LD_LIBRARY_PATH Deleted: trunk/sight/native/README =================================================================== --- trunk/sight/native/README 2007-08-20 10:16:34 UTC (rev 949) +++ trunk/sight/native/README 2007-08-20 10:33:32 UTC (rev 950) @@ -1,13 +0,0 @@ -This directory contains both the native and java-side code for -SIGHT. (System information gathering hybrid tool). - - -Building -======== -ant -To build the native part see native/BUILDING - -Running the examples -==================== -before running the examples you may have to set LD_LIBRARY_PATH, something like -LD_LIBRARY_PATH=/opt/SMAWoIS/openssl/lib; export LD_LIBRARY_PATH

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r949 - trunk/sight/native/share.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-20 06:16:34 -0400 (Mon, 20 Aug 2007) New Revision: 949 Modified: trunk/sight/native/share/jnu.c Log: Typo. Modified: trunk/sight/native/share/jnu.c =================================================================== --- trunk/sight/native/share/jnu.c 2007-07-24 12:37:26 UTC (rev 948) +++ trunk/sight/native/share/jnu.c 2007-08-20 10:16:34 UTC (rev 949) @@ -796,7 +796,7 @@ int ic = 0; size_t ci; size_t cl = strlen(cmnt); - for (ci = 0; i < cl; ci++) { + for (ci = 0; ci < cl; ci++) { if (*pline == cmnt[ci]) { ic = 1; break;

17 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits August 2007