FS-9775: Committing to get assistance with building unqlite

libs/libblade/Makefile.am

@@ -6,13 +6,14 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS    += -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 
 lib_LTLIBRARIES	  = libblade.la
-libblade_la_SOURCES  = src/blade.c src/blade_stack.c src/blade_peer.c src/bpcp.c
-libblade_la_CFLAGS	  = $(AM_CFLAGS) $(AM_CPPFLAGS)
+libblade_la_SOURCES  = src/blade.c src/blade_stack.c src/blade_peer.c src/bpcp.c src/blade_datastore.c src/unqlite.c
+libblade_la_CFLAGS	  = $(AM_CFLAGS) $(AM_CPPFLAGS) -DUNQLITE_ENABLE_THREADS
 libblade_la_LDFLAGS  =  -version-info 0:1:0 -lncurses -lpthread -lm $(AM_LDFLAGS)
 
 library_includedir	= $(prefix)/include
 library_include_HEADERS = src/include/blade.h src/include/blade_types.h src/include/blade_stack.h src/include/blade_peer.h src/include/bpcp.h
-library_include_HEADERS += test/tap.h
+library_include_HEADERS += src/include/blade_datastore.h
+library_include_HEADERS += src/include/unqlite.h test/tap.h
 
 tests: libblade.la
 	$(MAKE) -C test tests

libs/libblade/src/blade_datastore.c

+/*
+ * Copyright (c) 2007-2014, Anthony Minessale II
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blade.h"
+
+
+typedef enum {
+	BDS_NONE = 0,
+	BDS_MYPOOL = (1 << 0),
+} bdspvt_flag_t;
+
+struct blade_datastore_s {
+	bdspvt_flag_t flags;
+	ks_pool_t *pool;
+};
+
+
+KS_DECLARE(ks_status_t) blade_datastore_destroy(blade_datastore_t **bdsP)
+{
+	blade_datastore_t *bds = NULL;
+	bdspvt_flag_t flags;
+	ks_pool_t *pool;
+
+	ks_assert(bdsP);
+
+	bds = *bdsP;
+	*bdsP = NULL;
+
+	ks_assert(bds);
+
+	flags = bds->flags;
+	pool = bds->pool;
+
+	ks_pool_free(bds->pool, &bds);
+
+	if (pool && (flags & BDS_MYPOOL)) ks_pool_close(&pool);
+
+	return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(ks_status_t) blade_datastore_create(blade_datastore_t **bdsP, ks_pool_t *pool)
+{
+	bdspvt_flag_t newflags = BDS_NONE;
+	blade_datastore_t *bds = NULL;
+
+	if (!pool) {
+		newflags |= BDS_MYPOOL;
+		ks_pool_open(&pool);
+		ks_assert(pool);
+	}
+
+	bds = ks_pool_alloc(pool, sizeof(*bds));
+	bds->flags = newflags;
+	bds->pool = pool;
+	*bdsP = bds;
+
+	return KS_STATUS_SUCCESS;
+}
+
+KS_DECLARE(void) blade_datastore_pulse(blade_datastore_t *bds, int32_t timeout)
+{
+	ks_assert(bds);
+	ks_assert(timeout >= 0);
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */

libs/libblade/src/blade_stack.c

@@ -44,6 +44,7 @@ struct blade_handle_s {
 	ks_pool_t *pool;
 	ks_thread_pool_t *tpool;
 	blade_peer_t *peer;
+	blade_datastore_t *datastore;
 };
 
 
@@ -63,6 +64,8 @@ KS_DECLARE(ks_status_t) blade_handle_destroy(blade_handle_t **bhP)
 	flags = bh->flags;
 	pool = bh->pool;
 
+	if (bh->datastore) blade_datastore_destroy(&bh->datastore);
+
 	blade_peer_destroy(&bh->peer);
     if (bh->tpool && (flags & BH_MYTPOOL)) ks_thread_pool_destroy(&bh->tpool);
 
@@ -146,6 +149,17 @@ KS_DECLARE(void) blade_handle_pulse(blade_handle_t *bh, int32_t timeout)
 	ks_assert(timeout >= 0);
 
 	blade_peer_pulse(bh->peer, timeout);
+	if (bh->datastore) blade_datastore_pulse(bh->datastore, timeout);
+}
+
+
+KS_DECLARE(void) blade_handle_datastore_start(blade_handle_t *bh)
+{
+	ks_assert(bh);
+
+	if (bh->datastore) return;
+
+	blade_datastore_create(&bh->datastore, bh->pool);
 }
 
 

libs/libblade/src/include/blade.h

@@ -36,9 +36,11 @@
 #include <ks.h>
 #include <ks_dht.h>
 #include <sodium.h>
+#include "unqlite.h"
 #include "blade_types.h"
 #include "blade_stack.h"
 #include "blade_peer.h"
+#include "blade_datastore.h"
 #include "bpcp.h"
 
 KS_BEGIN_EXTERN_C

libs/libblade/src/include/blade_datastore.h

+/*
+ * Copyright (c) 2007-2014, Anthony Minessale II
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BLADE_DATASTORE_H_
+#define _BLADE_DATASTORE_H_
+#include <blade.h>
+
+KS_BEGIN_EXTERN_C
+KS_DECLARE(ks_status_t) blade_datastore_create(blade_datastore_t **bdsP, ks_pool_t *pool);
+KS_DECLARE(ks_status_t) blade_datastore_destroy(blade_datastore_t **bdsP);
+KS_DECLARE(void) blade_datastore_pulse(blade_datastore_t *bds, int32_t timeout);
+KS_END_EXTERN_C
+
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */

libs/libblade/src/include/blade_types.h

@@ -39,6 +39,7 @@ KS_BEGIN_EXTERN_C
 
 typedef struct blade_handle_s blade_handle_t;
 typedef struct blade_peer_s blade_peer_t;
+typedef struct blade_datastore_s blade_datastore_t;
 
 KS_END_EXTERN_C