May 2009 - jbossnative-commits - Jboss List Archives

JBoss Native SVN: r2425 - trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-05-16 16:35:41 -0400 (Sat, 16 May 2009) New Revision: 2425 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/DefaultRpcResponse.java Log: Use custom serialization Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/DefaultRpcResponse.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/DefaultRpcResponse.java 2009-05-15 21:20:41 UTC (rev 2424) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/DefaultRpcResponse.java 2009-05-16 20:35:41 UTC (rev 2425) @@ -21,6 +21,8 @@ */ package org.jboss.modcluster.ha.rpc; +import java.io.IOException; + import org.jboss.ha.framework.interfaces.ClusterNode; import org.jboss.modcluster.Utils; @@ -33,7 +35,7 @@ /** The serialVersionUID */ private static final long serialVersionUID = -6410563421870835482L; - private final ClusterNode sender; + private ClusterNode sender; private Throwable exception; private T result; @@ -70,4 +72,31 @@ { this.exception = exception; } + + private void writeObject(java.io.ObjectOutputStream out) throws IOException + { + out.writeObject(this.sender); + + boolean exists = this.result != null; + out.writeBoolean(exists); + if (exists) + { + out.writeObject(this.result); + } + + exists = this.exception != null; + out.writeBoolean(exists); + if (exists) + { + out.writeObject(this.exception); + } + } + + @SuppressWarnings("unchecked") + private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException + { + this.sender = (ClusterNode) in.readObject(); + this.result = in.readBoolean() ? (T) in.readObject() : null; + this.exception = in.readBoolean() ? (Throwable) in.readObject() : null; + } }

14 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2424 - trunk/mod_cluster/src/main/resources.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-05-15 17:20:41 -0400 (Fri, 15 May 2009) New Revision: 2424 Modified: trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml Log: Add admin-console to excluded contexts Modified: trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml =================================================================== --- trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml 2009-05-15 16:42:55 UTC (rev 2423) +++ trunk/mod_cluster/src/main/resources/mod-cluster-jboss-beans.xml 2009-05-15 21:20:41 UTC (rev 2424) @@ -38,7 +38,7 @@   - <property name="excludedContexts">${jboss.modcluster.excludedContexts:ROOT,invoker,jbossws,jmx-console,juddi,web-console}</property> + <property name="excludedContexts">${jboss.modcluster.excludedContexts:ROOT,admin-console,invoker,jbossws,jmx-console,juddi,web-console}</property>

14 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2423 - trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-05-15 12:42:55 -0400 (Fri, 15 May 2009) New Revision: 2423 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ModClusterServiceStatus.java Log: Needs to be serializable. Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ModClusterServiceStatus.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ModClusterServiceStatus.java 2009-05-14 18:13:39 UTC (rev 2422) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ModClusterServiceStatus.java 2009-05-15 16:42:55 UTC (rev 2423) @@ -22,6 +22,7 @@ package org.jboss.modcluster.ha.rpc; +import java.io.Serializable; import java.util.List; import java.util.Set; @@ -37,7 +38,7 @@ * @author Brian Stansberry */ @Immutable -public class ModClusterServiceStatus +public class ModClusterServiceStatus implements Serializable { /** The serialVersionUID */ private static final long serialVersionUID = -6591593007825931165L;

14 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2422 - trunk/mod_cluster/native/mod_slotmem.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-14 14:13:39 -0400 (Thu, 14 May 2009) New Revision: 2422 Modified: trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c Log: Oops that is _very_ bad... Modified: trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c =================================================================== --- trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2009-05-13 19:43:48 UTC (rev 2421) +++ trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2009-05-14 18:13:39 UTC (rev 2422) @@ -214,7 +214,7 @@ } if (!isfree) { rv = func((void *)ptr, data, i, pool); - if (rv != APR_SUCCESS) + if (rv == APR_SUCCESS) return(rv); } ptr = ptr + mem->size;

14 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2421 - in trunk/mod_cluster/native: mod_slotmem and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-13 15:43:48 -0400 (Wed, 13 May 2009) New Revision: 2421 Modified: trunk/mod_cluster/native/include/slotmem.h trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c Log: Small errors detected while reviewing the code. Modified: trunk/mod_cluster/native/include/slotmem.h =================================================================== --- trunk/mod_cluster/native/include/slotmem.h 2009-05-04 11:57:23 UTC (rev 2420) +++ trunk/mod_cluster/native/include/slotmem.h 2009-05-13 19:43:48 UTC (rev 2421) @@ -122,9 +122,10 @@ */ apr_status_t (* ap_slotmem_free)(ap_slotmem_t *s, int item_id, void*mem); /** - * Lock the slotmem. + * Return the used id in the slotmem table. * @param s ap_slotmem_t to use. - * @return APR_SUCCESS if all went well + * @param ids array of int where to store the free idents. + * @return number of slotmem in use. */ int (*ap_slotmem_get_used)(ap_slotmem_t *s, int *ids); /** Modified: trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c =================================================================== --- trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2009-05-04 11:57:23 UTC (rev 2420) +++ trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2009-05-13 19:43:48 UTC (rev 2421) @@ -214,7 +214,7 @@ } if (!isfree) { rv = func((void *)ptr, data, i, pool); - if (rv == APR_SUCCESS) + if (rv != APR_SUCCESS) return(rv); } ptr = ptr + mem->size;

14 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2420 - trunk/mod_cluster/native/mod_slotmem.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-04 07:57:23 -0400 (Mon, 04 May 2009) New Revision: 2420 Modified: trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c Log: May sure it compiles with httpd-trunk. Modified: trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c =================================================================== --- trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2009-05-04 08:28:03 UTC (rev 2419) +++ trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2009-05-04 11:57:23 UTC (rev 2420) @@ -94,8 +94,13 @@ if ((shmid = shmget(shmkey, 0, SHM_R | SHM_W)) == -1) { return errno; } +#if MODULE_MAGIC_NUMBER_MAJOR > 20081212 + shmbuf.shm_perm.uid = ap_unixd_config.user_id; + shmbuf.shm_perm.gid = ap_unixd_config.group_id; +#else shmbuf.shm_perm.uid = unixd_config.user_id; shmbuf.shm_perm.gid = unixd_config.group_id; +#endif shmbuf.shm_perm.mode = 0600; if (shmctl(shmid, IPC_SET, &shmbuf) == -1) { return errno;

14 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2419 - in trunk/mod_cluster/native: mod_manager and 1 other directories.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-04 04:28:03 -0400 (Mon, 04 May 2009) New Revision: 2419 Modified: trunk/mod_cluster/native/include/node.h trunk/mod_cluster/native/include/slotmem.h trunk/mod_cluster/native/mod_manager/mod_manager.c trunk/mod_cluster/native/mod_manager/node.c trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c Log: MODCLUSTER-74: Remove the slotmem_lock/slotmem_unlock from the slotmem API. Modified: trunk/mod_cluster/native/include/node.h =================================================================== --- trunk/mod_cluster/native/include/node.h 2009-05-04 06:57:05 UTC (rev 2418) +++ trunk/mod_cluster/native/include/node.h 2009-05-04 08:28:03 UTC (rev 2419) @@ -120,20 +120,6 @@ */ apr_status_t remove_node(mem_t *s, nodeinfo_t *node); -/** - * Lock the whole the shared table - * @param pointer to the shared table. - * @return APR_SUCCESS if all went well - */ -apr_status_t lock_node(mem_t *s); - -/** - * Unlock the whole the shared table - * @param pointer to the shared table. - * @return APR_SUCCESS if all went well - */ -apr_status_t unlock_node(mem_t *s); - /* * get the ids for the used (not free) nodes in the table * @param pointer to the shared table. @@ -205,13 +191,5 @@ * Find the node using the JVMRoute information */ apr_status_t (*find_node)(nodeinfo_t **node, const char *route); -/* - * Lock the whole node table - */ -int (*lock_nodes)(); -/* - * Unlock the whole node table - */ -int (*unlock_nodes)(); }; #endif /*NODE_H*/ Modified: trunk/mod_cluster/native/include/slotmem.h =================================================================== --- trunk/mod_cluster/native/include/slotmem.h 2009-05-04 06:57:05 UTC (rev 2418) +++ trunk/mod_cluster/native/include/slotmem.h 2009-05-04 08:28:03 UTC (rev 2419) @@ -126,19 +126,6 @@ * @param s ap_slotmem_t to use. * @return APR_SUCCESS if all went well */ -apr_status_t (* ap_slotmem_lock)(ap_slotmem_t *s); -/** - * Unlock the slotmem. - * @param s ap_slotmem_t to use. - * @return APR_SUCCESS if all went well - */ -apr_status_t (* ap_slotmem_unlock)(ap_slotmem_t *s); -/** - * Return the used id in the slotmem table. - * @param s ap_slotmem_t to use. - * @param ids array of int where to store the free idents. - * @return number of slotmem in use. - */ int (*ap_slotmem_get_used)(ap_slotmem_t *s, int *ids); /** * Return the size of the slotmem table. Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c =================================================================== --- trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-05-04 06:57:05 UTC (rev 2418) +++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-05-04 08:28:03 UTC (rev 2419) @@ -147,14 +147,6 @@ { return (find_node(nodestatsmem, node, route)); } -static apr_status_t loc_unlock_node() -{ - return (unlock_node(nodestatsmem)); -} -static apr_status_t loc_lock_node() -{ - return (lock_node(nodestatsmem)); -} /* Check is the nodes (in shared memory) were modified since last * call to worker_nodes_are_updated(). @@ -205,8 +197,6 @@ loc_worker_nodes_are_updated, loc_remove_node, loc_find_node, - loc_lock_node, - loc_unlock_node }; /* Modified: trunk/mod_cluster/native/mod_manager/node.c =================================================================== --- trunk/mod_cluster/native/mod_manager/node.c 2009-05-04 06:57:05 UTC (rev 2418) +++ trunk/mod_cluster/native/mod_manager/node.c 2009-05-04 08:28:03 UTC (rev 2419) @@ -213,26 +213,6 @@ return rv; } -/** - * Lock the shared table - * @param pointer to the shared table. - * @return APR_SUCCESS if all went well - */ -apr_status_t lock_node(mem_t *s) -{ - return (s->storage->ap_slotmem_lock(s->slotmem)); -} - -/** - * Unlock the shared table - * @param pointer to the shared table. - * @return APR_SUCCESS if all went well - */ -apr_status_t unlock_node(mem_t *s) -{ - return (s->storage->ap_slotmem_unlock(s->slotmem)); -} - /* * get the ids for the used (not free) nodes in the table * @param pointer to the shared table. Modified: trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c =================================================================== --- trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2009-05-04 06:57:05 UTC (rev 2418) +++ trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2009-05-04 08:28:03 UTC (rev 2419) @@ -523,8 +523,6 @@ &ap_slotmem_mem, &ap_slotmem_alloc, &ap_slotmem_free, - &ap_slotmem_lock, - &ap_slotmem_unlock, &ap_slotmem_get_used, &ap_slotmem_get_max_size };

14 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2418 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

14 years, 11 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 May 2009