You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2006/08/29 10:32:05 UTC
svn commit: r438010 - in /tomcat/connectors/trunk/jk/native/common:
jk_lb_worker.c jk_lb_worker.h
Author: rjung
Date: Tue Aug 29 01:32:05 2006
New Revision: 438010
URL: http://svn.apache.org/viewvc?rev=438010&view=rev
Log:
Give new constant a more eprecise name.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=438010&r1=438009&r2=438010&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Tue Aug 29 01:32:05 2006
@@ -824,32 +824,32 @@
if (first == 1 && s->add_log_items) {
const char **log_names = jk_pool_alloc(s->pool, sizeof(char *) * JK_LB_NOTES_COUNT);
const char **log_values = jk_pool_alloc(s->pool, sizeof(char *) * JK_LB_NOTES_COUNT);
- char *buf = jk_pool_alloc(s->pool, sizeof(char *) * JK_LB_NOTES_COUNT * JK_LB_MAX_SZ);;
+ char *buf = jk_pool_alloc(s->pool, sizeof(char *) * JK_LB_NOTES_COUNT * JK_LB_UINT64_STR_SZ);;
first = 0;
if (log_names && log_values && buf) {
log_names[0] = JK_NOTE_LB_FIRST_NAME;
log_values[0] = prec->s->name;
- snprintf(buf, JK_LB_MAX_SZ, "%" JK_UINT64_T_FMT, prec->s->lb_value);
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%" JK_UINT64_T_FMT, prec->s->lb_value);
log_names[1] = JK_NOTE_LB_FIRST_VALUE;
log_values[1] = buf;
- buf += JK_LB_MAX_SZ;
- snprintf(buf, JK_LB_MAX_SZ, "%" JK_UINT64_T_FMT, prec->s->elected);
+ buf += JK_LB_UINT64_STR_SZ;
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%" JK_UINT64_T_FMT, prec->s->elected);
log_names[2] = JK_NOTE_LB_FIRST_ACCESSED;
log_values[2] = buf;
- buf += JK_LB_MAX_SZ;
- snprintf(buf, JK_LB_MAX_SZ, "%" JK_UINT64_T_FMT, prec->s->readed);
+ buf += JK_LB_UINT64_STR_SZ;
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%" JK_UINT64_T_FMT, prec->s->readed);
log_names[3] = JK_NOTE_LB_FIRST_READ;
log_values[3] = buf;
- buf += JK_LB_MAX_SZ;
- snprintf(buf, JK_LB_MAX_SZ, "%" JK_UINT64_T_FMT, prec->s->transferred);
+ buf += JK_LB_UINT64_STR_SZ;
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%" JK_UINT64_T_FMT, prec->s->transferred);
log_names[4] = JK_NOTE_LB_FIRST_TRANSFERRED;
log_values[4] = buf;
- buf += JK_LB_MAX_SZ;
- snprintf(buf, JK_LB_MAX_SZ, "%" JK_UINT32_T_FMT, prec->s->errors);
+ buf += JK_LB_UINT64_STR_SZ;
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%" JK_UINT32_T_FMT, prec->s->errors);
log_names[5] = JK_NOTE_LB_FIRST_ERRORS;
log_values[5] = buf;
- buf += JK_LB_MAX_SZ;
- snprintf(buf, JK_LB_MAX_SZ, "%d", prec->s->busy);
+ buf += JK_LB_UINT64_STR_SZ;
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%d", prec->s->busy);
log_names[6] = JK_NOTE_LB_FIRST_BUSY;
log_values[6] = buf;
log_names[7] = JK_NOTE_LB_FIRST_ACTIVATION;
@@ -879,31 +879,31 @@
if (prec && s->add_log_items) {
const char **log_names = jk_pool_alloc(s->pool, sizeof(char *) * JK_LB_NOTES_COUNT);
const char **log_values = jk_pool_alloc(s->pool, sizeof(char *) * JK_LB_NOTES_COUNT);
- char *buf = jk_pool_alloc(s->pool, sizeof(char *) * JK_LB_NOTES_COUNT * JK_LB_MAX_SZ);;
+ char *buf = jk_pool_alloc(s->pool, sizeof(char *) * JK_LB_NOTES_COUNT * JK_LB_UINT64_STR_SZ);;
if (log_names && log_values && buf) {
log_names[0] = JK_NOTE_LB_LAST_NAME;
log_values[0] = prec->s->name;
- snprintf(buf, JK_LB_MAX_SZ, "%" JK_UINT64_T_FMT, prec->s->lb_value);
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%" JK_UINT64_T_FMT, prec->s->lb_value);
log_names[1] = JK_NOTE_LB_LAST_VALUE;
log_values[1] = buf;
- buf += JK_LB_MAX_SZ;
- snprintf(buf, JK_LB_MAX_SZ, "%" JK_UINT64_T_FMT, prec->s->elected);
+ buf += JK_LB_UINT64_STR_SZ;
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%" JK_UINT64_T_FMT, prec->s->elected);
log_names[2] = JK_NOTE_LB_LAST_ACCESSED;
log_values[2] = buf;
- buf += JK_LB_MAX_SZ;
- snprintf(buf, JK_LB_MAX_SZ, "%" JK_UINT64_T_FMT, prec->s->readed);
+ buf += JK_LB_UINT64_STR_SZ;
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%" JK_UINT64_T_FMT, prec->s->readed);
log_names[3] = JK_NOTE_LB_LAST_READ;
log_values[3] = buf;
- buf += JK_LB_MAX_SZ;
- snprintf(buf, JK_LB_MAX_SZ, "%" JK_UINT64_T_FMT, prec->s->transferred);
+ buf += JK_LB_UINT64_STR_SZ;
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%" JK_UINT64_T_FMT, prec->s->transferred);
log_names[4] = JK_NOTE_LB_LAST_TRANSFERRED;
log_values[4] = buf;
- buf += JK_LB_MAX_SZ;
- snprintf(buf, JK_LB_MAX_SZ, "%" JK_UINT32_T_FMT, prec->s->errors);
+ buf += JK_LB_UINT64_STR_SZ;
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%" JK_UINT32_T_FMT, prec->s->errors);
log_names[5] = JK_NOTE_LB_LAST_ERRORS;
log_values[5] = buf;
- buf += JK_LB_MAX_SZ;
- snprintf(buf, JK_LB_MAX_SZ, "%d", prec->s->busy);
+ buf += JK_LB_UINT64_STR_SZ;
+ snprintf(buf, JK_LB_UINT64_STR_SZ, "%d", prec->s->busy);
log_names[6] = JK_NOTE_LB_LAST_BUSY;
log_values[6] = buf;
log_names[7] = JK_NOTE_LB_LAST_ACTIVATION;
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h?rev=438010&r1=438009&r2=438010&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Tue Aug 29 01:32:05 2006
@@ -69,7 +69,7 @@
#define JK_LB_ACTIVATION_TEXT_DISABLED ("DIS")
#define JK_LB_ACTIVATION_TEXT_STOPPED ("STP")
-#define JK_LB_MAX_SZ (21)
+#define JK_LB_UINT64_STR_SZ (21)
#define JK_LB_NOTES_COUNT (9)
#define JK_NOTE_LB_FIRST_NAME ("JK_LB_FIRST_NAME")
#define JK_NOTE_LB_FIRST_VALUE ("JK_LB_FIRST_VALUE")
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org