summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/server.h')
-rw-r--r--src/server.h19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/server.h b/src/server.h
index 3256278ea..43086eba2 100644
--- a/src/server.h
+++ b/src/server.h
@@ -840,7 +840,14 @@ struct redisMemOverhead {
size_t bytes_per_key;
float dataset_perc;
float peak_perc;
- float fragmentation;
+ float total_frag;
+ size_t total_frag_bytes;
+ float allocator_frag;
+ size_t allocator_frag_bytes;
+ float allocator_rss;
+ size_t allocator_rss_bytes;
+ float rss_extra;
+ size_t rss_extra_bytes;
size_t num_dbs;
struct {
size_t dbid;
@@ -869,6 +876,14 @@ typedef struct rdbSaveInfo {
#define RDB_SAVE_INFO_INIT {-1,0,"000000000000000000000000000000",-1}
+typedef struct malloc_stats {
+ size_t zmalloc_used;
+ size_t process_rss;
+ size_t allocator_allocated;
+ size_t allocator_active;
+ size_t allocator_resident;
+} malloc_stats;
+
/*-----------------------------------------------------------------------------
* Global server state
*----------------------------------------------------------------------------*/
@@ -971,7 +986,7 @@ struct redisServer {
long long slowlog_entry_id; /* SLOWLOG current entry ID */
long long slowlog_log_slower_than; /* SLOWLOG time limit (to get logged) */
unsigned long slowlog_max_len; /* SLOWLOG max number of items logged */
- size_t resident_set_size; /* RSS sampled in serverCron(). */
+ malloc_stats cron_malloc_stats; /* sampled in serverCron(). */
long long stat_net_input_bytes; /* Bytes read from network. */
long long stat_net_output_bytes; /* Bytes written to network. */
size_t stat_rdb_cow_bytes; /* Copy on write bytes during RDB saving. */