diff options
| author | Simon Rettberg | 2017-09-02 16:37:21 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-09-02 16:37:21 +0200 |
| commit | 18aea50ca77d8a5931ba4fdb0ad507e12c0f6f7c (patch) | |
| tree | 008de7e5bb182f625b3ddc3f7394a9dc440c7e2e /src/server | |
| parent | [SERVER] Split server-only defs from config.h to serverconfig.h (diff) | |
| download | dnbd3-18aea50ca77d8a5931ba4fdb0ad507e12c0f6f7c.tar.gz dnbd3-18aea50ca77d8a5931ba4fdb0ad507e12c0f6f7c.tar.xz dnbd3-18aea50ca77d8a5931ba4fdb0ad507e12c0f6f7c.zip | |
[*] Continue splitting #defines to clientconfig.h etc.
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/altservers.c | 2 | ||||
| -rw-r--r-- | src/server/globals.h | 2 | ||||
| -rw-r--r-- | src/server/serverconfig.h | 39 |
3 files changed, 2 insertions, 41 deletions
diff --git a/src/server/altservers.c b/src/server/altservers.c index 12450aa..4c87344 100644 --- a/src/server/altservers.c +++ b/src/server/altservers.c @@ -3,7 +3,7 @@ #include "helper.h" #include "image.h" #include "../shared/protocol.h" -#include "serverconfig.h" +#include "../serverconfig.h" #include <assert.h> #include <inttypes.h> diff --git a/src/server/globals.h b/src/server/globals.h index cc3b6be..31b7741 100644 --- a/src/server/globals.h +++ b/src/server/globals.h @@ -3,7 +3,7 @@ #include "../types.h" #include "../shared/fdsignal.h" -#include "serverconfig.h" +#include "../serverconfig.h" #include <stdint.h> #include <time.h> #include <pthread.h> diff --git a/src/server/serverconfig.h b/src/server/serverconfig.h deleted file mode 100644 index efb8476..0000000 --- a/src/server/serverconfig.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef _SERVERCONFIG_H_ -#define _SERVERCONFIG_H_ - -#include "../config.h" - -// +++++ Performance related -#define SERVER_MAX_CLIENTS 4000 -#define SERVER_MAX_IMAGES 5000 -#define SERVER_MAX_ALTS 250 -#define SERVER_MAX_UPLINK_FAILS 8 // How many times may a server fail until it is considered bad -#define SERVER_BAD_UPLINK_IGNORE 120 // How many seconds is a server considered bad? -#define SERVER_MAX_UPLINK_QUEUE 1500 // Maximum number of queued requests per uplink -#define SERVER_UPLINK_QUEUELEN_THRES 900 // Threshold where we start dropping incoming clients -#define SERVER_MAX_PENDING_ALT_CHECKS 50 -#define SERVER_CACHE_MAP_SAVE_INTERVAL 90 - -// Time in ms to wait for a read/write call to complete on an uplink connection -#define SOCKET_TIMEOUT_UPLINK 5000 -// Same for client connections. Be a bit more liberal here -#define SOCKET_TIMEOUT_CLIENT 15000 -// When waiting for the next request header from client, allow the timeout from above -// to expire this many times. This allows for greater idle times without also increasing -// the timeout for cases where we wait for additional data or are actively sending a reply -#define SOCKET_TIMEOUT_CLIENT_RETRIES 3 - -// +++++ Other magic constants -#define SERVER_RTT_PROBES 5 -#define SERVER_RTT_DELAY_INIT 5 -#define SERVER_RTT_DELAY_MAX 45 -#define SERVER_RTT_DELAY_FAILED 180 - -#define SERVER_REMOTE_IMAGE_CHECK_CACHETIME 120 // 2 minutes -#define SERVER_MAX_PROXY_IMAGE_SIZE 100000000000LL // 100GB - -// Which is the minimum protocol version the server expects from the client -#define MIN_SUPPORTED_CLIENT 2 - -#endif - |