[towel-db commit] r35 - in trunk/c: . include src
codesite...@google.com
Date: Sat Jun 28 09:31:52 2008
New Revision: 35
Added:
trunk/c/include/
trunk/c/include/toweldb.h
trunk/c/src/
trunk/c/src/SConstruct
trunk/c/src/database.c
- copied, changed from r27, /trunk/c/database.c
trunk/c/src/parser.c
- copied unchanged from r34, /trunk/c/parser.c
trunk/c/src/record.c
- copied, changed from r27, /trunk/c/record.c
Removed:
trunk/c/database.c
trunk/c/parser.c
trunk/c/record.c
trunk/c/toweldb.h
Modified:
trunk/c/SConstruct
Log:
Begin shuffling files around, and start converting toweldb to a library.
Modified: trunk/c/SConstruct
==============================================================================
--- trunk/c/SConstruct (original)
+++ trunk/c/SConstruct Sat Jun 28 09:31:52 2008
@@ -1 +1,5 @@
-Program( 'toweldb', ['database.c', 'record.c', 'parser.c'] )
+SConscript( ['src/SConstruct'] )
+
+Help("""
+Currently, there are no special options or features available.
+""")
Added: trunk/c/include/toweldb.h
==============================================================================
--- (empty file)
+++ trunk/c/include/toweldb.h Sat Jun 28 09:31:52 2008
@@ -0,0 +1,110 @@
+/* towel-db - A human readable database system.
+ * Copyright (C) 2008 Andrew <i80...@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TOWELDB_H
+#define TOWELDB_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <string.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+
+/* Version of the database implemented */
+#define TOWELDB_DB_VERSION 0
+
+/* Various utility macros */
+#define TOWELDB_MAX_KEY_LEN 255
+#define TOWELDB_META "_db"
+
+/* FIXME: This has to be changed for non-POSIX systems */
+#define TOWELDB_PATH_JOIN '/'
+
+/* Errors */
+typedef char toweldb_err;
+enum _toweldb_err
+{
+ toweldb_err_noerror = 0, /* Everything's just dandy */
+ toweldb_err_record_exists, /* The record already exists */
+ toweldb_err_write_error,
+ toweldb_err_delete_error,
+ toweldb_err_key_too_long,
+ toweldb_err_versionmismatch, /* The database is of a different
version */
+};
+
+/* Linked list of record fields */
+typedef struct _toweldb_tuple
+{
+ off_t key_loc;
+ off_t value_end;
+ unsigned int key_len;
+ unsigned long value_len;
+ char* key;
+ char* value;
+ struct _toweldb_tuple* next;
+} toweldb_field_node;
+
+/* Database */
+typedef struct
+{
+ DIR* db_dir;
+ char* path;ex
+ char mode;
+ toweldb_err error;
+ char max_key_len;
+} toweldb_db;
+
+/* Record */
+typedef struct toweldb_rec
+typedef struct
+{
+ time_t read_time;
+ toweldb_db* parent;
+ char* key;
+ toweldb_field_node* contents_start;
+} toweldb_rec;
+
+/* Database stuff */
+toweldb_db* toweldb_open( const char* path, const char mode );
+ /* Open a database located at path. If mode is 'c', create it if
needed */
+toweldb_err toweldb_drop( toweldb_db* db );
+ /* Delete the database. WARNING: BROKEN */
+void toweldb_close( toweldb_db* db );
+ /* Close a database and free the memory storing it. */
+
+/* Record functions */
+unsigned int toweldb_get_num_recs( toweldb_db* db );
+ /* Get the number of records in the database. */
+char* toweldb_get_next_key( toweldb_db* db );
+ /* Get the next key in the database. This is a wrapper around the POSIX
+ * readdir that skips entries that the programmer doesn't need. It will
+ * return NULL and rewind if it hits the last item in the directory. */
+toweldb_err toweldb_create_rec( toweldb_db* db, const char* key );
+ /* Create a new record within the database with the given key. */
+toweldb_err toweldb_remove_rec( toweldb_db* db, const char* key );
+ /* Remove the record with name key from the database */
+
+/* Record parsing functions */
+toweldb_rec* toweldb_read_rec( toweldb_db* db, const char* key );
+ /* Read the record specified by key */
+void toweldb_free_rec( toweldb_rec* rec );
+ /* Free the record memory */
+
+#endif
Added: trunk/c/src/SConstruct
==============================================================================
--- (empty file)
+++ trunk/c/src/SConstruct Sat Jun 28 09:31:52 2008
@@ -0,0 +1,5 @@
+env = Environment( CFLAGS = '-Wall -g' )
+lib = env.SharedLibrary( 'toweldb',
['database.c', 'record.c', 'parser.c'] )
+env.Install( '/usr/local/lib', lib )
+env.Install( '/usr/local/include', source=['toweldb.h'] )
+env.Alias( 'install', '/' )
Copied: trunk/c/src/database.c (from r27, /trunk/c/database.c)
==============================================================================
--- /trunk/c/database.c (original)
+++ trunk/c/src/database.c Sat Jun 28 09:31:52 2008
@@ -17,32 +17,6 @@
#include "toweldb.h"
-int
-main()
-{
- /* This is all testing garbage */
- toweldb_db* db = NULL;
- toweldb_rec* rec = NULL;
- char* temp = NULL;
- int i = 0;
-
- db = toweldb_open( "/home/andrew/bah", 'c' );
-
- /*for( i = 0; i < 5; i++ )
- {
- temp = toweldb_get_next_key( db );
- if( temp != NULL )
- printf( "%s\n", temp );
- }*/
-
- rec = toweldb_read_rec( db, "foo" );
- toweldb_free_rec( rec );
-
- toweldb_close( db );
-
- return 0;
-}
-
toweldb_db*
toweldb_open( const char* path, const char mode )
{
Copied: trunk/c/src/record.c (from r27, /trunk/c/record.c)
==============================================================================
--- /trunk/c/record.c (original)
+++ trunk/c/src/record.c Sat Jun 28 09:31:52 2008
@@ -15,6 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "record.h"
#include "toweldb.h"
bool toweldb_is_record_real( toweldb_db* db, const char* key );