Optimize configure options.

common/config-mgr.h

@@ -2,11 +2,11 @@
 #define SEAF_CONFIG_MGR_H
 
 typedef struct _SeafCfgManager SeafCfgManager;
+typedef struct _SeafCfgManagerPriv SeafCfgManagerPriv;
 #include "seafile-session.h"
 
 struct _SeafCfgManager {
-    GKeyFile *config;
-    SeafDB *db;
+    struct _SeafCfgManagerPriv *priv;
 };
 
 typedef struct _SeafileSession SeafileSession;

common/fs-mgr.c

@@ -612,6 +612,12 @@ chunking_worker (gpointer vdata, gpointer user_data)
     int fd = -1;
     ssize_t n;
     int idx;
+    gint64 fixed_block_size;
+    int fixed_block_size_mb;
+    char *group = g_key_file_has_group (seaf->config, "fileserver") ? "fileserver" : "httpserver";
+
+    fixed_block_size_mb = seaf_cfg_manager_get_config_int (seaf->cfg_mgr, group, "fixed_block_size");
+    fixed_block_size = fixed_block_size_mb * ((gint64)1 << 20);
 
     chunk->block_buf = g_new0 (char, chunk->len);
     if (!chunk->block_buf) {
@@ -646,7 +652,7 @@ chunking_worker (gpointer vdata, gpointer user_data)
     if (chunk->result < 0)
         goto out;
 
-    idx = chunk->offset / seaf->http_server->fixed_block_size;
+    idx = chunk->offset / fixed_block_size;
     memcpy (data->blk_sha1s + idx * CHECKSUM_LENGTH, chunk->checksum, CHECKSUM_LENGTH);
 
 out:
@@ -673,8 +679,22 @@ split_file_to_block (const char *repo_id,
     int n_pending = 0;
     CDCDescriptor *chunk;
     int ret = 0;
+    int fixed_block_size_mb;
+    int max_indexing_threads;
+    gint64 fixed_block_size;
+    char *group = g_key_file_has_group (seaf->config, "fileserver") ? "fileserver" : "httpserver";
+
+    fixed_block_size_mb = seaf_cfg_manager_get_config_int (seaf->cfg_mgr,
+                                                           group,
+                                                           "fixed_block_size");
+    fixed_block_size = fixed_block_size_mb * ((gint64)1 << 20);
+
+    max_indexing_threads = seaf_cfg_manager_get_config_int (seaf->cfg_mgr,
+                                                            group,
+                                                            "max_indexing_threads");
+
+    n_blocks = (file_size + fixed_block_size - 1) / fixed_block_size;
 
-    n_blocks = (file_size + seaf->http_server->fixed_block_size - 1) / seaf->http_server->fixed_block_size;
     block_sha1s = g_new0 (uint8_t, n_blocks * CHECKSUM_LENGTH);
     if (!block_sha1s) {
         seaf_warning ("Failed to allocate block_sha1s.\n");
@@ -694,7 +714,7 @@ split_file_to_block (const char *repo_id,
     data.finished_tasks = finished_tasks;
 
     tpool = g_thread_pool_new (chunking_worker, &data,
-                               seaf->http_server->max_indexing_threads, FALSE, NULL);
+                               max_indexing_threads, FALSE, NULL);
     if (!tpool) {
         seaf_warning ("Failed to allocate thread pool\n");
         ret = -1;
@@ -705,7 +725,7 @@ split_file_to_block (const char *repo_id,
     guint64 len;
     guint64 left = (guint64)file_size;
     while (left > 0) {
-        len = ((left >= seaf->http_server->fixed_block_size) ? seaf->http_server->fixed_block_size : left);
+        len = ((left >= fixed_block_size) ? fixed_block_size : left);
 
         chunk = g_new0 (CDCDescriptor, 1);
         chunk->offset = offset;
@@ -725,7 +745,7 @@ split_file_to_block (const char *repo_id,
             goto out;
         }
         if (indexed)
-            *indexed += seaf->http_server->fixed_block_size;
+            *indexed += fixed_block_size;
 
         if ((--n_pending) <= 0) {
             if (indexed)

common/rpc-service.c

@@ -4336,6 +4336,12 @@ seafile_get_server_config_boolean (const char *group, const char *key, GError **
     return seaf_cfg_manager_get_config_boolean (seaf->cfg_mgr, group, key);
 }
 
+GList *
+seafile_list_config_options (GError **error)
+{
+    return NULL;
+}
+
 GObject *
 seafile_get_group_shared_repo_by_path (const char *repo_id,
                                        const char *path,

fuse/Makefile.am

@@ -34,7 +34,8 @@ seaf_fuse_SOURCES = seaf-fuse.c \
                     ../common/obj-store.c \
                     ../common/obj-backend-fs.c \
                     ../common/obj-backend-riak.c \
-                    ../common/seafile-crypt.c
+                    ../common/seafile-crypt.c \
+                    ../common/config-mgr.c
 
 seaf_fuse_LDADD = @CCNET_LIBS@ \
 		  @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ \

fuse/seafile-session.c

@@ -74,6 +74,10 @@ seafile_session_new(const char *central_config_dir,
         goto onerror;
     }
 
+    session->cfg_mgr = seaf_cfg_manager_new (session);
+    if (!session->cfg_mgr)
+        goto onerror;
+
     if (read_excluded_users (session) < 0) {
         seaf_warning ("Failed to load excluded users.\n");
         goto onerror;
@@ -111,7 +115,7 @@ read_excluded_users (SeafileSession *session)
     int l, i;
     char *hash_value;
 
-    users = seaf_key_file_get_string (session->config, "fuse", "excluded_users", NULL);
+    users = seaf_cfg_manager_get_config_string (session->cfg_mgr, "fuse", "excluded_users");
     if (!users)
         return 0;
 

fuse/seafile-session.h

@@ -11,6 +11,7 @@
 #include "branch-mgr.h"
 #include "commit-mgr.h"
 #include "repo-mgr.h"
+#include "config-mgr.h"
 
 typedef struct _SeafileSession SeafileSession;
 
@@ -27,6 +28,7 @@ struct _SeafileSession {
     SeafBranchManager   *branch_mgr;
     SeafCommitManager   *commit_mgr;
     SeafRepoManager     *repo_mgr;
+    SeafCfgManager      *cfg_mgr;
 
     GHashTable          *excluded_users;
 

include/seafile-rpc.h

@@ -104,6 +104,9 @@ seafile_set_config_int (const char *key, int value, GError **error);
 int
 seafile_get_config_int (const char *key, GError **error);
 
+GList*
+seafile_list_config_options (GError **error);
+
 int
 seafile_set_upload_rate_limit (int limit, GError **error);
 

python/seafile/rpcclient.py

@@ -713,6 +713,10 @@ def get_server_config_boolean (group, key):
     def set_server_config_boolean (group, key, value):
         pass
 
+    @searpc_func("objlist", [])
+    def list_config_options ():
+        pass
+
     @searpc_func("int", ["string", "int"])
     def repo_has_been_shared (repo_id, including_groups):
         pass

python/seaserv/api.py

@@ -791,6 +791,9 @@ def set_server_config_boolean (self, group, key, value):
         i_value = 1 if bool(value) else 0
         return seafserv_threaded_rpc.set_server_config_boolean (group, key, i_value)
 
+    def list_config_options (self):
+        return seafserv_threaded_rpc.list_config_options()
+
     def del_org_group_repo(self, repo_id, org_id, group_id):
         seafserv_threaded_rpc.del_org_group_repo(repo_id, org_id, group_id)
 

server/Makefile.am

@@ -29,7 +29,6 @@ noinst_HEADERS = web-accesstoken-mgr.h  seafile-session.h \
 	upload-file.h \
 	access-file.h \
 	pack-dir.h \
-	fileserver-config.h \
 	http-status-codes.h \
 	zip-download-mgr.h \
 	index-blocks-mgr.h

server/copy-mgr.c

@@ -44,13 +44,6 @@ seaf_copy_manager_new (struct _SeafileSession *session)
                                                    (GDestroyNotify)copy_task_free);
     pthread_mutex_init (&mgr->priv->lock, NULL);
 
-    mgr->max_files = g_key_file_get_int64 (session->config,
-                                           "web_copy", "max_files", NULL);
-    mgr->max_size = g_key_file_get_int64 (session->config,
-                                          "web_copy", "max_size", NULL);
-    /* size is given in MB */
-    mgr->max_size <<= 20;
-
     return mgr;
 }
 

server/copy-mgr.h

@@ -16,9 +16,6 @@ struct _SeafileCopyTask;
 struct _SeafCopyManager {
     struct _SeafileSession *session;
     struct _SeafCopyManagerPriv *priv;
-
-    gint64 max_files;
-    gint64 max_size;
 };
 typedef struct _SeafCopyManager SeafCopyManager;
 typedef struct _SeafCopyManagerPriv SeafCopyManagerPriv;

server/fileserver-config.c

@@ -2,7 +2,7 @@
 
 #include <glib.h>
 
-#include "fileserver-config.h"
+#include "seafile-session.h"
 
 const char *OLD_GROUP_NAME = "httpserver";
 const char *GROUP_NAME = "fileserver";
@@ -14,22 +14,22 @@ get_group_name(GKeyFile *config)
 }
 
 int
-fileserver_config_get_integer(GKeyFile *config, char *key, GError **error)
+fileserver_config_get_integer(SeafCfgManager *mgr, GKeyFile *config, char *key)
 {
     const char *group = get_group_name(config);
-    return g_key_file_get_integer (config, group, key, error);
+    return seaf_cfg_manager_get_config_int (mgr, group, key);
 }
 
 char *
-fileserver_config_get_string(GKeyFile *config, char *key, GError **error)
+fileserver_config_get_string(SeafCfgManager *mgr, GKeyFile *config, char *key)
 {
     const char *group = get_group_name(config);
-    return g_key_file_get_string (config, group, key, error);
+    return seaf_cfg_manager_get_config_string (mgr, group, key);
 }
 
 gboolean
-fileserver_config_get_boolean(GKeyFile *config, char *key, GError **error)
+fileserver_config_get_boolean(SeafCfgManager *mgr, GKeyFile *config, char *key)
 {
     const char *group = get_group_name(config);
-    return g_key_file_get_boolean (config, group, key, error);
+    return seaf_cfg_manager_get_config_boolean (mgr, group, key);
 }

server/gc/repo-mgr.c

@@ -498,10 +498,6 @@ seaf_repo_manager_get_repo_history_limit (SeafRepoManager *mgr,
                                                          "history", "keep_days");
     }
 
-    if (per_repo_days < 0) {
-        per_repo_days = -1;
-    }
-
     return per_repo_days;
 }