cvs commit: jakarta-tomcat-connectors/jk/native/common jk_pool.c
mturk 2005/04/27 23:24:53
Modified:jk/native/common jk_pool.c
Log:
Fix compile-time warnings for _DEBUG. (again)
Revision ChangesPath
1.14 +9 -9 jakarta-tomcat-connectors/jk/native/common/jk_pool.c
Index: jk_pool.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_pool.c 27 Apr 2005 09:38:35 - 1.13
+++ jk_pool.c 28 Apr 2005 06:24:53 - 1.14
@@ -115,15 +115,15 @@
}
#if defined (DEBUG) || defined(_DEBUG)
-void jk_dump_pool(jk_pool_t *p, FILE * f)
+static void jk_dump_pool(jk_pool_t *p, FILE * f)
{
-fprintf(f, Dumping for pool [%#lx]\n, p);
-fprintf(f, size [%d]\n, p-size);
-fprintf(f, pos [%d]\n, p-pos);
-fprintf(f, buf [%#lx]\n, p-buf);
-fprintf(f, dyn_size [%d]\n, p-dyn_size);
-fprintf(f, dyn_pos [%d]\n, p-dyn_pos);
-fprintf(f, dynamic [%#lx]\n, p-dynamic);
+fprintf(f, Dumping for pool [%p]\n, p);
+fprintf(f, size [%ld]\n, p-size);
+fprintf(f, pos [%ld]\n, p-pos);
+fprintf(f, buf [%p]\n, p-buf);
+fprintf(f, dyn_size [%ld]\n, p-dyn_size);
+fprintf(f, dyn_pos [%ld]\n, p-dyn_pos);
+fprintf(f, dynamic [%p]\n, p-dynamic);
fflush(f);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_pool.c
mturk 2004/11/11 06:09:03
Modified:jk/native/common jk_pool.c
Log:
Add missing semicolon.
Revision ChangesPath
1.12 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_pool.c
Index: jk_pool.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_pool.c 11 Nov 2004 11:56:22 - 1.11
+++ jk_pool.c 11 Nov 2004 14:09:03 - 1.12
@@ -149,7 +149,7 @@
}
else {
#if defined (DEBUG) || defined(_DEBUG)
-jk_dump_pool(p, stderr)
+jk_dump_pool(p, stderr);
#endif
return NULL;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_pool.c jk_pool.h
mturk 2004/10/06 03:12:50
Modified:jk/native/common jk_pool.c jk_pool.h
Log:
Add alignment macros and use size_t instead unsigned.
Revision ChangesPath
1.8 +31 -41jakarta-tomcat-connectors/jk/native/common/jk_pool.c
Index: jk_pool.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_pool.c 24 Feb 2004 08:45:46 - 1.7
+++ jk_pool.c 6 Oct 2004 10:12:49 - 1.8
@@ -31,7 +31,7 @@
void jk_open_pool(jk_pool_t *p,
jk_pool_atom_t *buf,
- unsigned size)
+ size_t size)
{
p-pos = 0;
p-size = size;
@@ -44,20 +44,18 @@
void jk_close_pool(jk_pool_t *p)
{
-if(p) {
-jk_reset_pool(p);
-if(p-dynamic) {
-free(p-dynamic);
-}
+jk_reset_pool(p);
+if (p-dynamic) {
+free(p-dynamic);
}
}
void jk_reset_pool(jk_pool_t *p)
{
-if(p p-dyn_pos p-dynamic) {
-unsigned i;
-for(i = 0 ; i p-dyn_pos ; i++) {
-if(p-dynamic[i]) {
+if (p-dyn_pos p-dynamic) {
+size_t i;
+for (i = 0 ; i p-dyn_pos ; i++) {
+if (p-dynamic[i]) {
free(p-dynamic[i]);
}
}
@@ -67,27 +65,17 @@
p-pos = 0;
}
-void *jk_pool_alloc(jk_pool_t *p,
-size_t size)
+void *jk_pool_alloc(jk_pool_t *p, size_t size)
{
void *rc = NULL;
-if(p size 0) {
-/* Round size to the upper mult of 8 (or 16 on iSeries) */
- size--;
-#ifdef AS400
-size /= 16;
-size = (size + 1) * 16;
-#else
-size /= 8;
-size = (size + 1) * 8;
-#endif
-if((p-size - p-pos) = size) {
-rc = (p-buf[p-pos]);
-p-pos += size;
-} else {
-rc = jk_pool_dyn_alloc(p, size);
-}
+size = JK_ALIGN_DEFAULT(size);
+if ((p-size - p-pos) = size) {
+rc = (p-buf[p-pos]);
+p-pos += size;
+}
+else {
+rc = jk_pool_dyn_alloc(p, size);
}
return rc;
@@ -115,7 +103,7 @@
void *jk_pool_strdup(jk_pool_t *p,
const char *s)
{
-char *rc = NULL;
+void *rc = NULL;
if(s p) {
size_t size = strlen(s);
@@ -136,13 +124,13 @@
void jk_dump_pool(jk_pool_t *p,
FILE *f)
{
-fprintf(f, Dumping for pool [%x]\n, p);
+fprintf(f, Dumping for pool [%p]\n, p);
fprintf(f, size [%d]\n, p-size);
fprintf(f, pos [%d]\n, p-pos);
-fprintf(f, buf [%x]\n, p-buf);
+fprintf(f, buf [%p]\n, p-buf);
fprintf(f, dyn_size [%d]\n, p-dyn_size);
fprintf(f, dyn_pos [%d]\n, p-dyn_pos);
-fprintf(f, dynamic [%x]\n, p-dynamic);
+fprintf(f, dynamic [%p]\n, p-dynamic);
fflush(f);
}
@@ -150,13 +138,14 @@
static void *jk_pool_dyn_alloc(jk_pool_t *p,
size_t size)
{
-void *rc = NULL;
+void *rc;
-if(p-dyn_size == p-dyn_pos) {
-unsigned new_dyn_size = p-dyn_size + DEFAULT_DYNAMIC;
+if (p-dyn_size == p-dyn_pos) {
+size_t new_dyn_size = p-dyn_size * 2 + DEFAULT_DYNAMIC;
void **new_dynamic = (void **)malloc(new_dyn_size * sizeof(void *));
-if(new_dynamic) {
-if(p-dynamic) {
+if (new_dynamic) {
+if (p-dynamic) {
+/* Copy old dynamic slots */
memcpy(new_dynamic,
p-dynamic,
p-dyn_size * sizeof(void *));
@@ -166,14 +155,15 @@
p-dynamic = new_dynamic;
p-dyn_size = new_dyn_size;
-} else {
+}
+else {
return NULL;
}
}
rc = p-dynamic[p-dyn_pos] = malloc(size);
-if(p-dynamic[p-dyn_pos]) {
-p-dyn_pos ++;
+if (p-dynamic[p-dyn_pos]) {
+p-dyn_pos++;
}
return rc;
1.7 +27 -14jakarta-tomcat-connectors/jk/native/common/jk_pool.h
Index: jk_pool.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_pool.h 24 Feb 2004 08:45:46 - 1.6
+++ jk_pool.h 6 Oct 2004 10:12:49 - 1.7
@@ -64,11 +64,26 @@
#elif defined(IRIX)
typedef long long jk_pool_atom_t;
#elif defined(AS400)
-typedef void * jk_pool_atom_t;
+
RE: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_pool.c
Henri, I was just thinking, wouldn't be better to make that not only for AS400. If there are some other machines that has 16 byte pointers (IA64 perhaps), Then we cold make that as: #ifdef HUGE_POINTERS (or something like that) instead of AS400. It doesn't mater for now, but think of it as future option. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Comments on 16 (bytes !!!) pointers on iSeries. Yes, it's definitivly a strange machine. Last commit for jk 1.2.0 MT. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
