You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ji...@apache.org on 2016/11/06 20:15:34 UTC
svn commit: r1768387 - in /apr/apr-util/branches/1.6.x: NWGNUmakefile
include/apr_redis.h redis/apr_redis.c
Author: jim
Date: Sun Nov 6 20:15:34 2016
New Revision: 1768387
URL: http://svn.apache.org/viewvc?rev=1768387&view=rev
Log:
Force
Modified:
apr/apr-util/branches/1.6.x/NWGNUmakefile
apr/apr-util/branches/1.6.x/include/apr_redis.h
apr/apr-util/branches/1.6.x/redis/apr_redis.c
Modified: apr/apr-util/branches/1.6.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/NWGNUmakefile?rev=1768387&r1=1768386&r2=1768387&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.6.x/NWGNUmakefile Sun Nov 6 20:15:34 2016
@@ -261,6 +261,7 @@ FILES_lib_objs = \
$(OBJDIR)/apr_memcache.o \
$(OBJDIR)/apr_passwd.o \
$(OBJDIR)/apr_queue.o \
+ $(OBJDIR)/apr_redis.o \
$(OBJDIR)/apr_reslist.o \
$(OBJDIR)/apr_rmm.o \
$(OBJDIR)/apr_sha1.o \
@@ -297,7 +298,7 @@ install :: nlms FORCE
# Any specialized rules here
#
-vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:misc:strmatch:uri:xlate:xml
+vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:redis:misc:strmatch:uri:xlate:xml
#
# Include the 'tail' makefile that has targets that depend on variables defined
Modified: apr/apr-util/branches/1.6.x/include/apr_redis.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/include/apr_redis.h?rev=1768387&r1=1768386&r2=1768387&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/include/apr_redis.h (original)
+++ apr/apr-util/branches/1.6.x/include/apr_redis.h Sun Nov 6 20:15:34 2016
@@ -412,14 +412,16 @@ typedef struct
apr_uint64_t total_connections_received;
/** Total commands processed */
apr_uint64_t total_commands_processed;
+ /** Total commands rejected */
+ apr_uint64_t rejected_connections;
/** Total net input bytes */
apr_uint64_t total_net_input_bytes;
/** Total net output bytes */
apr_uint64_t total_net_output_bytes;
/** Keyspace hits */
- apr_uint32_t keyspace_hits;
+ apr_uint64_t keyspace_hits;
/** Keyspace misses */
- apr_uint32_t keyspace_misses;
+ apr_uint64_t keyspace_misses;
/* # Replication */
/** Role */
Modified: apr/apr-util/branches/1.6.x/redis/apr_redis.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/redis/apr_redis.c?rev=1768387&r1=1768386&r2=1768387&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/redis/apr_redis.c (original)
+++ apr/apr-util/branches/1.6.x/redis/apr_redis.c Sun Nov 6 20:15:34 2016
@@ -1416,6 +1416,9 @@ apr_redis_multgetp(apr_redis_t *rc,
#define STAT_total_commands_processed "total_commands_processed:"
#define STAT_total_commands_processed_LEN (sizeof(STAT_total_commands_processed)-1)
+#define STAT_rejected_connections "rejected_connections:"
+#define STAT_rejected_connections_LEN (sizeof(STAT_rejected_connections)-1)
+
#define STAT_total_net_input_bytes "total_net_input_bytes:"
#define STAT_total_net_input_bytes_LEN (sizeof(STAT_total_net_input_bytes)-1)
@@ -1470,10 +1473,11 @@ static void update_stats(char *info, apr
rc_do_stat(total_system_memory, uint64);
rc_do_stat(total_connections_received, uint64);
rc_do_stat(total_commands_processed, uint64);
+ rc_do_stat(rejected_connections, uint64);
rc_do_stat(total_net_input_bytes, uint64);
rc_do_stat(total_net_output_bytes, uint64);
- rc_do_stat(keyspace_hits, uint32);
- rc_do_stat(keyspace_misses, uint32);
+ rc_do_stat(keyspace_hits, uint64);
+ rc_do_stat(keyspace_misses, uint64);
rc_do_stat(connected_slaves, uint32);
rc_do_stat(used_cpu_sys, uint32);
rc_do_stat(used_cpu_user, uint32);