Cleaner fix part 1

[bluesky.git] / nfs3 / nfsd.c

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index e43f530..40d7a6e 100644 (file)
--- a/nfs3/nfsd.c
+++ b/nfs3/nfsd.c
@@ -10,6 +10,7 @@
  * filesystem. */
 
 #include "mount_prot.h"
+#include "nfs3_prot.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <rpc/pmap_clnt.h>
@@ -26,18 +27,51 @@ void register_rpc();
 BlueSkyFS *fs;
 BlueSkyStore *store;
 
+/* A cookie value returned for uncommitted writes and verified by commits; this
+ * should be a unique value each time the server is started. */
+char nfsd_instance_verf_cookie[NFS3_WRITEVERFSIZE];
+
+static void shutdown_handler(int num)
+{
+    g_print("SIGINT caught, shutting down...\n");
+    g_print("Proxy statistics:\n");
+    bluesky_stats_dump_all();
+    exit(1);
+}
+
 int main(int argc, char *argv[])
 {
     int i;
+
+    signal(SIGPIPE, SIG_IGN);
+    signal(SIGINT, shutdown_handler);
+
     bluesky_init();
-    register_rpc();
+    g_set_prgname("nfsd");
+
+    const char *target = getenv("BLUESKY_TARGET");
+    if (target == NULL)
+        target = "s3";
+
+    const char *key = getenv("BLUESKY_KEY");
+    if (key == NULL)
+        key = "";
 
-    bluesky_options.async_inode_fetches = 1;
+    const char *profile_output = getenv("BLUESKY_PROFILE_OUT");
+    if (profile_output != NULL)
+        bluesky_profile_set_output(fopen(profile_output, "a"));
 
-    store = bluesky_store_new("s3");
-    fs = bluesky_init_fs("export", store);
+    store = bluesky_store_new(target);
+    fs = bluesky_init_fs("export", store, key);
 
-    bluesky_debug_dump(fs);
+    const char *stats_output = getenv("BLUESKY_STATS_OUT");
+    if (stats_output != NULL)
+        bluesky_stats_run_periodic_dump(fopen(stats_output, "a"));
+
+    bluesky_crypt_random_bytes(nfsd_instance_verf_cookie,
+                               sizeof(nfsd_instance_verf_cookie));
+
+    register_rpc();
 
     svc_run();
     fprintf(stderr, "%s", "svc_run returned");