add cpp

Author: Davidson-Souza

Makefile.am

@@ -2,6 +2,10 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = include
 
+#lib_LTLIBRARIES = libutreexo_cpp.la
+#libutreexo_cpp_la_SOURCES = include/cpp/utreexo.cpp
+#libutreexo_cpp_la_LDFLAGS = -version-info 0:1:0
+
 check_PROGRAMS = test_flat_file test_forest
 test_flat_file_SOURCES = src/test_flat_file.c 
 

configure.ac

@@ -79,4 +79,7 @@ AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([include/Makefile])
 
+AC_LANG([C++])
+AC_PROG_CXX
+
 AC_OUTPUT

include/Makefile.am

@@ -1,3 +1,3 @@
-headers = utreexo.h
+headers = utreexo.h utreexo.hpp
 
               include_HEADERS = $(headers)

include/utreexo.h

@@ -52,6 +52,10 @@
 #ifndef UTREEXO_H
 #define UTREEXO_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 
 /**
@@ -81,11 +85,23 @@ typedef struct utreexo_forest_ *utreexo_forest;
  * forest can have up to 64 trees (which is more than enough for most use
  * cases).
  *
+ * This method returns 0 if everything goes Ok, 1 otherwise.
+ *
  * Out:         p: The newly created forest
  * In:   filename: File name of the forest backend. If the file doesn't exist,
  *                 it'll be created.
  */
-extern void utreexo_forest_init(utreexo_forest *p, const char *filename);
+extern int utreexo_forest_init(utreexo_forest *p, const char *filename);
+
+/**
+ * Frees-up a forest. This method should be called when you're done with
+ * the forest, otherwise may cause resource leak.
+ *
+ * This method doesn't fail.
+ *
+ * In:  p: A valid forest that have been innitialized using utreexo_forest_init
+ */
+extern int utreexo_forest_free(utreexo_forest p);
 
 /**
  * Modify is the main interface for a utreexo forest. Because order matters
@@ -94,13 +110,15 @@ extern void utreexo_forest_init(utreexo_forest *p, const char *filename);
  * takes as arguments the leaf that should be added/removed, and the number of
  * leaves for each operation.
  *
+ * This method returns 0 if everything goes Ok, 1 otherwise.
+ *
  * Out:           p: The newly created forest
  * In:         leaf: The leaf that should be added
  *       leaf_count: The number of leaves that should be added/removed
  */
-extern void utreexo_forest_modify(utreexo_forest forest,
-                                  utreexo_node_hash *utxos, int utxo_count,
-                                  utreexo_node_hash *stxos, int stxo_count);
+extern int utreexo_forest_modify(utreexo_forest forest,
+                                 utreexo_node_hash *utxos, int utxo_count,
+                                 utreexo_node_hash *stxos, int stxo_count);
 
 /**
  * Prove that some elements are in the forest. This function takes as input
@@ -110,6 +128,10 @@ extern void utreexo_forest_modify(utreexo_forest forest,
  * In:         leaf: The leaf that should be added
  *       leaf_count: The number of leaves that should be added/removed
  */
-static void utreexo_forest_prove(utreexo_forest forest, utreexo_node_hash *leaf,
-                                 int leaf_count, utreexo_node_hash *proof);
+static int utreexo_forest_prove(utreexo_forest forest, utreexo_node_hash *leaf,
+                                int leaf_count, utreexo_node_hash *proof);
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
 #endif

include/utreexo.hpp

@@ -0,0 +1,17 @@
+#include <utreexo.h>
+#include <vector>
+
+class UtreexoForest {
+private:
+  utreexo_forest forest;
+
+public:
+  UtreexoForest(char *path) { utreexo_forest_init(&this->forest, path); };
+  UtreexoForest() { utreexo_forest_init(&this->forest, "forest.bin"); };
+  ~UtreexoForest() { utreexo_forest_free(this->forest); };
+  void Modify(std::vector<utreexo_node_hash> utxos,
+              std::vector<utreexo_node_hash> stxos) {
+    utreexo_forest_modify(this->forest, utxos.data(), utxos.size(),
+                          stxos.data(), stxos.size());
+  };
+};

src/map_forest_impl.h

@@ -95,7 +95,7 @@ static inline void grab_node(struct utreexo_forest *f,
   *parent = pparent;
 }
 
-static inline void utreexo_forest_free(struct utreexo_forest *forest) {
+static inline void _utreexo_forest_free(struct utreexo_forest *forest) {
   utreexo_forest_file_close(forest->data);
   free(forest);
 }

src/mmap_forest.c

@@ -13,26 +13,37 @@ static const int utreexo_forest_version_major = 0;
 
 #define CHECK_PTR(x)                                                           \
   if (x == NULL) {                                                             \
-    errno = -1;                                                                \
-    return;                                                                    \
+    return 1;                                                                  \
   }
 
-void utreexo_forest_modify(struct utreexo_forest *forest,
-                           utreexo_node_hash *leaf, int leaf_count) {
+int utreexo_forest_modify(struct utreexo_forest *forest,
+                          utreexo_node_hash *leaf, int leaf_count) {
+
   for (int i = 0; i < leaf_count; i++) {
     utreexo_forest_add(forest, leaf[i]);
   }
+
+  return 1;
+}
+int utreexo_forest_free(struct utreexo_forest *p) {
+  _utreexo_forest_free(p);
+  return 0;
 }
 
-void utreexo_forest_init(struct utreexo_forest **p, const char *filename) {
+int utreexo_forest_init(struct utreexo_forest **p, const char *filename) {
+  CHECK_PTR(p);
+  CHECK_PTR(filename);
 
   struct utreexo_forest *forest = malloc(sizeof(struct utreexo_forest));
   struct utreexo_forest_file *file = NULL;
   char *heap;
+
   utreexo_forest_file_init(&file, (void **)&heap, filename);
 
   forest->data = file;
   forest->nLeaf = (uint64_t *)heap;
   forest->roots = (utreexo_forest_node **)(heap + sizeof(uint64_t));
+
   *p = forest;
+  return 0;
 }

src/mmap_forest.h

@@ -27,7 +27,7 @@ struct utreexo_forest {
 static inline void utreexo_forest_add(struct utreexo_forest *p,
                                       utreexo_node_hash leaf);
 /* Free up a forest. */
-static inline void utreexo_forest_free(struct utreexo_forest *p);
+static inline void _utreexo_forest_free(struct utreexo_forest *p);
 
 /* Deletes a single node from a forest.
  *