diff options
| author | dormando <dormando@rydia.net> | 2020-05-29 13:06:07 -0700 |
|---|---|---|
| committer | dormando <dormando@rydia.net> | 2020-06-09 16:30:05 -0700 |
| commit | 7c2df4a70d3aa50dd507ee92a0af4e0279433988 (patch) | |
| tree | e86a889cdb4963c357d387aeb29e95db66a71465 /memcached.h | |
| parent | d343e53b5a2f1dbab8ea79ea5d84a5937760e24b (diff) | |
| download | memcached-7c2df4a70d3aa50dd507ee92a0af4e0279433988.tar.gz | |
net: remove most response obj cache related code
accept but warn if the commandline is used. also keeps the oom counter
distinct so users have a chance of telling what type of memory pressure
they're under.
Diffstat (limited to 'memcached.h')
| -rw-r--r-- | memcached.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/memcached.h b/memcached.h index ba944ef..2cafed9 100644 --- a/memcached.h +++ b/memcached.h @@ -327,9 +327,7 @@ struct thread_stats { #undef X struct slab_stats slab_stats[MAX_NUMBER_OF_SLAB_CLASSES]; uint64_t lru_hits[POWER_LARGEST]; - uint64_t response_obj_bytes; - uint64_t response_obj_total; - uint64_t response_obj_free; + uint64_t read_buf_count; uint64_t read_buf_bytes; uint64_t read_buf_bytes_free; }; @@ -448,8 +446,7 @@ struct settings { int idle_timeout; /* Number of seconds to let connections idle */ unsigned int logger_watcher_buf_size; /* size of logger's per-watcher buffer */ unsigned int logger_buf_size; /* size of per-thread logger buffer */ - unsigned int resp_obj_mem_limit; /* total megabytes allowable for resp objects */ - unsigned int read_buf_mem_limit; /* total megabytes allowable for read buffers */ + unsigned int read_buf_mem_limit; /* total megabytes allowable for net buffers */ bool drop_privileges; /* Whether or not to drop unnecessary process privileges */ bool watch_enabled; /* allows watch commands to be dropped */ bool relaxed_privileges; /* Relax process restrictions when running testapp */ @@ -611,7 +608,6 @@ typedef struct { int notify_send_fd; /* sending end of notify pipe */ struct thread_stats stats; /* Stats generated by this thread */ struct conn_queue *new_conn_queue; /* queue of new connections to handle */ - cache_t *resp_cache; /* response objects */ cache_t *rbuf_cache; /* static-sized read buffers */ mc_resp_bundle *open_bundle; #ifdef EXTSTORE |