X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_chkpt_stores.h;h=d7bc3f07207269b2a0947750f2e07494bfdc20d6;hb=a19f42cc45ff4c4a07bf917a78a2a422319a78bb;hp=505ef8cb9fedcac60df35759c739643e43e89eba;hpb=a9a6c3664c8fdbdb9841a55d1a2fca7f4fa8f5de;p=palacios.git

diff --git a/palacios/src/palacios/vmm_chkpt_stores.h b/palacios/src/palacios/vmm_chkpt_stores.h
index 505ef8c..d7bc3f0 100644
--- a/palacios/src/palacios/vmm_chkpt_stores.h
+++ b/palacios/src/palacios/vmm_chkpt_stores.h
@@ -47,11 +47,11 @@ static struct {} null_store __attribute__((__used__))			\
 static void * debug_open_chkpt(char * url, chkpt_mode_t mode) {
    
     if (mode == LOAD) {
-	V3_Print("Cannot load from debug store\n");
+	V3_Print(VM_NONE, VCORE_NONE, "Cannot load from debug store\n");
 	return NULL;
     }
 
-    V3_Print("Opening Checkpoint: %s\n", url);
+    V3_Print(VM_NONE, VCORE_NONE, "Opening Checkpoint: %s\n", url);
 
     return (void *)1;
 }
@@ -59,25 +59,24 @@ static void * debug_open_chkpt(char * url, chkpt_mode_t mode) {
 
 
 static int debug_close_chkpt(void * store_data) {
-    V3_Print("Closing Checkpoint\n");
+    V3_Print(VM_NONE, VCORE_NONE, "Closing Checkpoint\n");
     return 0;
 }
 
 static void * debug_open_ctx(void * store_data, 
-			     void * parent_ctx, 
 			     char * name) {
-    V3_Print("[%s]\n", name);
+    V3_Print(VM_NONE, VCORE_NONE, "[%s]\n", name);
     return (void *)1;
 }
 
 static int debug_close_ctx(void * store_data, void * ctx) {
-    V3_Print("[CLOSE]\n"); 
+    V3_Print(VM_NONE, VCORE_NONE, "[CLOSE]\n"); 
     return 0;
 }
 
 static int debug_save(void * store_data, void * ctx, 
 		      char * tag, uint64_t len, void * buf) {
-    V3_Print("%s:\n", tag);
+    V3_Print(VM_NONE, VCORE_NONE, "%s:\n", tag);
 
     if (len > 100) {
 	len = 100;
@@ -90,7 +89,7 @@ static int debug_save(void * store_data, void * ctx,
 
 static int debug_load(void * store_data, void * ctx, 
 				  char * tag, uint64_t len, void * buf) {
-    V3_Print("Loading not supported !!!\n");
+    V3_Print(VM_NONE, VCORE_NONE, "Loading not supported !!!\n");
     return 0;
 }
 
@@ -109,7 +108,6 @@ register_chkpt_store(debug_store);
 
 
 
-
 #ifdef V3_CONFIG_KEYED_STREAMS
 #include <interfaces/vmm_keyed_stream.h>
 
@@ -135,7 +133,6 @@ static int keyed_stream_close_chkpt(void * store_data) {
 }
 
 static void * keyed_stream_open_ctx(void * store_data, 
-				    void * parent_ctx, 
 				    char * name) {
     v3_keyed_stream_t stream = store_data;
 
@@ -152,12 +149,20 @@ static int keyed_stream_close_ctx(void * store_data, void * ctx) {
 
 static int keyed_stream_save(void * store_data, void * ctx, 
 				  char * tag, uint64_t len, void * buf) {
-    return v3_keyed_stream_write_key(store_data, ctx, buf, len);
+  if (v3_keyed_stream_write_key(store_data, ctx, tag, strlen(tag), buf, len) != len) { 
+    return -1;
+  } else {
+    return 0;
+  }
 }
 
 static int keyed_stream_load(void * store_data, void * ctx, 
 				  char * tag, uint64_t len, void * buf) {
-    return v3_keyed_stream_read_key(store_data, ctx, buf, len);
+  if (v3_keyed_stream_read_key(store_data, ctx, tag, strlen(tag), buf, len) != len) { 
+    return -1;
+  } else {
+    return 0;
+  }
 }
 
 
@@ -179,6 +184,122 @@ register_chkpt_store(keyed_stream_store);
 
 
 
+#ifdef V3_CONFIG_FILE
+#include <interfaces/vmm_file.h>
+
+
+struct file_ctx {
+    v3_file_t file;
+    uint64_t offset;
+    char * filename;
+};
+    
+
+static void * dir_open_chkpt(char * url, chkpt_mode_t mode) {
+    if (mode == SAVE) {
+	if (v3_mkdir(url, 0755, 1) != 0) {
+	    return NULL;
+	}
+    }
+
+    return url;
+}
+
+
+
+static int dir_close_chkpt(void * store_data) {
+    return 0;
+}
+
+static void * dir_open_ctx(void * store_data, 
+			   char * name) {
+
+    char * url = store_data;
+    struct file_ctx * ctx = NULL;
+
+
+    ctx = V3_Malloc(sizeof(struct file_ctx));
+
+    if (!ctx) {
+	PrintError(VM_NONE, VCORE_NONE, "Cannot allocate\n");
+	return NULL;
+    }
+
+    memset(ctx, 0, sizeof(struct file_ctx));
+
+    ctx->filename = V3_Malloc(strlen(url) + strlen(name) + 5);
+
+    if (!ctx->filename) {
+	PrintError(VM_NONE, VCORE_NONE, "Cannot allocate\n");
+	V3_Free(ctx);
+	return NULL;
+    }
+
+
+    memset(ctx->filename, 0, strlen(url) + strlen(name) + 5);
+
+    snprintf(ctx->filename, strlen(url) + strlen(name) + 5, "%s/%s", url, name);
+
+
+    ctx->file = v3_file_open(NULL, ctx->filename, FILE_OPEN_MODE_READ | FILE_OPEN_MODE_WRITE | FILE_OPEN_MODE_CREATE);
+   
+    return ctx;
+}
+
+static int dir_close_ctx(void * store_data, void * ctx) {
+    struct file_ctx * file_ctx = ctx;
+
+    v3_file_close(file_ctx->file);
+
+    V3_Free(file_ctx->filename);
+    V3_Free(file_ctx);
+
+    return 0;
+}
+
+static int dir_save(void * store_data, void * ctx, 
+		    char * tag, uint64_t len, void * buf) {
+    struct file_ctx * file_ctx = ctx;
+    uint64_t ret = 0;
+   
+    ret = v3_file_write(file_ctx->file, buf, len, file_ctx->offset);
+
+    file_ctx->offset += ret;
+    
+    return 0;
+}
+
+static int dir_load(void * store_data, void * ctx, 
+		    char * tag, uint64_t len, void * buf) {
+    struct file_ctx * file_ctx = ctx;
+    uint64_t ret = 0;
+    
+    ret = v3_file_read(file_ctx->file, buf, len, file_ctx->offset);
+
+    file_ctx->offset += ret;
+
+    return 0;
+}
+
+
+static struct chkpt_interface dir_store = {
+    .name = "DIR",
+    .open_chkpt = dir_open_chkpt,
+    .close_chkpt = dir_close_chkpt,
+    .open_ctx = dir_open_ctx, 
+    .close_ctx = dir_close_ctx,
+    .save = dir_save,
+    .load = dir_load
+};
+
+register_chkpt_store(dir_store);
+
+
+
+#endif
+
+
+