X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfsd.c;h=40d7a6e23124d8064e69d874b0191aa538a5fb70;hb=388030970805a70cb4fad34ade5e3de7a3607a57;hp=f33a945b85028aa6af662247420ffe8dee8134aa;hpb=6d555bf4c9e9efae66d1844347d20fbf305784fa;p=bluesky.git

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index f33a945..40d7a6e 100644
--- 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>
@@ -19,34 +20,58 @@
 #include <netinet/in.h>
 #include <glib.h>
 
-#include "libs3.h"
 #include "bluesky.h"
 
 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[])
 {
-    g_thread_init(NULL);
-    register_rpc();
+    int i;
 
-    S3_initialize(NULL, S3_INIT_ALL);
+    signal(SIGPIPE, SIG_IGN);
+    signal(SIGINT, shutdown_handler);
 
-    fs = bluesky_new_fs("export");
+    bluesky_init();
+    g_set_prgname("nfsd");
 
-    BlueSkyInode *root;
-    root = bluesky_new_inode(BLUESKY_ROOT_INUM, BLUESKY_DIRECTORY);
-    root->nlink = 1;
-    root->mode = 0755;
-    bluesky_insert_inode(fs, root);
+    const char *target = getenv("BLUESKY_TARGET");
+    if (target == NULL)
+        target = "s3";
 
-    BlueSkyInode *file;
-    file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), BLUESKY_REGULAR);
-    file->nlink = 1;
-    file->mode = 0755;
-    bluesky_insert_inode(fs, file);
-    bluesky_directory_insert(root, "demo", file->inum);
+    const char *key = getenv("BLUESKY_KEY");
+    if (key == NULL)
+        key = "";
+
+    const char *profile_output = getenv("BLUESKY_PROFILE_OUT");
+    if (profile_output != NULL)
+        bluesky_profile_set_output(fopen(profile_output, "a"));
+
+    store = bluesky_store_new(target);
+    fs = bluesky_init_fs("export", store, key);
+
+    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");