iostats

index.c

@@ -12,9 +12,6 @@
 
 #define SWAP(type, x, y) do { type __tmp__; __tmp__ = y; y = x; x = __tmp__; } while (0)
 
-unsigned reads  = 0;
-unsigned writes = 0;
-
 /* private functions */
 void _btree_insert_into_node(btree_t *tree, btree_node_t *node, btree_entry_t *entry);
 void _btree_remove_from_node(btree_t *tree, btree_node_t *node, unsigned index);
@@ -669,3 +666,9 @@ void btree_close(btree_t* tree)
     file_close(tree->file);
     tape_close(tree->main);
 }
+
+void btree_flush(btree_t* tree)
+{
+    file_flush(tree->file);
+    file_flush(tree->main->file);
+}

index.h

@@ -18,9 +18,6 @@
 #define NODE_IS_ROOT 1
 #define NODE_IS_LEAF 2
 
-extern unsigned reads;
-extern unsigned writes;
-
 typedef struct {
     size_t d;         /* 8 bytes long */
     size_t page_size; /* 8 bytes long */
@@ -82,6 +79,7 @@ page_t btree_read_record(btree_t *tree, record_key_t key, record_t *record);
 
 btree_entry_t *btree_get_entry(btree_node_t* node, unsigned n);
 
+void btree_flush(btree_t* tree);
 void btree_close(btree_t* tree);
 
 #endif /* INDEX_H */

io.c

@@ -5,6 +5,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+unsigned reads = 0, reads_all = 0, writes = 0, writes_all = 0;
+
 page_cache_entry_t *_file_load_page(file_t* file, page_t page);
 void _file_flush_page(file_t *file, page_cache_entry_t *entry);
 
@@ -41,14 +43,21 @@ void file_close(file_t* file)
 
 size_t file_read(file_t* file, page_t page, void* buffer, size_t length)
 {
+    reads_all++;
+
     page_cache_entry_t *entry = _file_load_page(file, page);
     memcpy(buffer, entry->data, length);
 
+    printfv(VERBOSITY_DEBUG, "[io] Reading page %zu in %s (%zu bytes).\n", page, file->filename, entry->size);
+
     return entry->size;
 }
 
 size_t file_write(file_t* file, page_t page, const void* buffer, size_t length)
 {
+    printfv(VERBOSITY_DEBUG, "[io] Writing page %zu in %s (%zu bytes).\n", page, file->filename, length);
+    writes_all++;
+
     page_cache_entry_t *entry = _file_load_page(file, page);
 
     memset(entry->data, 0, PAGE_SIZE);

io.h

@@ -12,8 +12,8 @@
 #include <stdio.h>
 #include <inttypes.h>
 
-extern unsigned reads;
-extern unsigned writes;
+extern unsigned reads, reads_all;
+extern unsigned writes, writes_all;
 
 typedef uint64_t page_t;
 typedef uint64_t offset_t;

openidx.c

@@ -66,6 +66,8 @@ result_t read_command(const char* command, char* args);
 result_t delete_command(const char* command, char* args);
 result_t update_command(const char* command, char* args);
 result_t verbosity_command(const char* command, char* args);
+result_t iostat_command(const char* command, char* args);
+result_t flush_command(const char* command, char* args);
 
 static command_t commands[] = {
     { "help", "Prints out help", help_command },
@@ -78,6 +80,8 @@ static command_t commands[] = {
     { "read", "Reads record", read_command },
     { "delete", "Deletes record", delete_command },
     { "update", "Updates record", update_command },
+    { "iostat", "Prints IO counts", iostat_command },
+    { "flush", "Fluhshes index into disk", flush_command },
     { "verbosity", "Changes the verbosity", verbosity_command },
 };
 
@@ -86,6 +90,18 @@ result_t exit_command(const char* command, char* args)
     return RESULT_EXIT;
 }
 
+result_t iostat_command(const char* command, char* args)
+{
+    printfv(VERBOSITY_NORMAL, "R/W: %u/%u (excluding cache: %u/%u)\n", reads, writes, reads_all, writes_all);
+    return RESULT_OK;
+}
+
+result_t flush_command(const char* command, char* args)
+{
+    btree_flush(&tree);
+    return RESULT_OK;
+}
+
 result_t verbosity_command(const char* command, char* args)
 {
     verbosity_t v;
@@ -333,6 +349,7 @@ int main(int argc, char* argv[])
         sprintf(prompt, "%s> ", options.index);
 
         while ((line = readline(prompt))) {
+            unsigned r = reads, w = writes, ra = reads_all, wa = writes_all;
             command = get_command(line);
 
             if (!command) {
@@ -343,6 +360,8 @@ int main(int argc, char* argv[])
             if (command->function(line, line + strlen(line) + 1) == RESULT_EXIT) {
                 break;
             }
+
+            printfv(VERBOSITY_VERBOSE, "[io] R/W: %u/%u (excluding cache: %u/%u)\n", reads - r, writes - w, reads_all - ra, writes_all - wa);
         }
 
         btree_close(&tree);