X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=database%2Fdatabase.c;h=e6e87075e43cbeb896728ad32f8cfe8fa101bad3;hb=a3b400b3d5eff0027efe12936b08d80c93e0273a;hp=1e33811c1d29f13f638ff603fa2481f32f3c5a29;hpb=1cf0f1ebfbd5b5a621af2a49ac0328fd0cec4bf4;p=blerg.git

diff --git a/database/database.c b/database/database.c
index 1e33811..e6e8707 100644
--- a/database/database.c
+++ b/database/database.c
@@ -1,3 +1,6 @@
+/* Blerg is (C) 2011 The Dominion of Awesome, and is distributed under a
+ * BSD-style license.  Please see the COPYING file for details.
+ */
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -10,6 +13,8 @@
 #include <sys/file.h>
 #include <fcntl.h>
 #include "database.h"
+#include "subscription.h"
+#include "util.h"
 #include "config.h"
 
 uint64_t blerg_get_record_count(struct blerg *blerg) {
@@ -111,8 +116,8 @@ int blerg_exists(const char *name) {
 	int namelen = strlen(name);
 	char filename[512];
 
-	if (namelen > 32) {
-		perror("Name too long");
+	if (!valid_name(name)) {
+		fprintf(stderr, "Invalid name\n");
 		return 0;
 	}
 
@@ -129,8 +134,8 @@ struct blerg *blerg_open(const char *name) {
 	struct stat st;
 	uint64_t sequence;
 
-	if (namelen > 32) {
-		perror("Name too long");
+	if (!valid_name(name)) {
+		fprintf(stderr, "Invalid name\n");
 		return NULL;
 	}
 	struct blerg *blerg = malloc(sizeof(struct blerg));
@@ -159,10 +164,17 @@ struct blerg *blerg_open(const char *name) {
 		goto open_failed_meta_open;
 	}
 	fstat(blerg->meta_fd, &st);
-	if (st.st_size == 0) {
-		char *buf = (char *) malloc(sizeof(struct meta));
-		memset(buf, 0, sizeof(struct meta));
-		write(blerg->meta_fd, buf, sizeof(struct meta));
+	if (st.st_size < sizeof(struct meta)) {
+		// Fill the difference in size between sizeof(struct meta) and
+		// the file size with nulls.  This allows seamless upgrades as
+		// long as struct meta only adds members.
+		int len = sizeof(struct meta) - st.st_size;
+		char *buf = (char *) malloc(len);
+		memset(buf, 0, len);
+		int tmpfd = dup(blerg->meta_fd);
+		FILE* tmp = fdopen(tmpfd, "a");
+		fwrite(buf, len, 1, tmp);
+		fclose(tmp);
 		free(buf);
 	}
 	blerg->meta = (struct meta *) mmap(NULL, sizeof(struct meta), PROT_READ | PROT_WRITE, MAP_SHARED, blerg->meta_fd, 0);
@@ -203,7 +215,7 @@ int blerg_close(struct blerg *blerg) {
 
 int blerg_store(struct blerg *blerg, const char *data, int len) {
 	if (len > MAX_RECORD_SIZE) {
-		printf("len > 64K\n");
+		fprintf(stderr, "len > 64K\n");
 		return -1;
 	}
 
@@ -212,7 +224,7 @@ int blerg_store(struct blerg *blerg, const char *data, int len) {
 
 	uint64_t record = blerg_increment_record_count(blerg);
 	if (record == -1) {
-		printf("Could not find free record\n");
+		fprintf(stderr, "Could not find free record\n");
 		return -1;
 	}
 	int segment = record / RECORDS_PER_SEGMENT;
@@ -242,17 +254,18 @@ int blerg_store(struct blerg *blerg, const char *data, int len) {
 	blerg->index[seg_rec].length = len;
 	blerg->index[seg_rec].timestamp = time(NULL);
 
-	tag_scan(blerg->name, data, len, record);
-
 	flock(blerg->data_fd, LOCK_UN);
 	flock(blerg->index_fd, LOCK_UN);
 
+	tag_scan(blerg->name, data, len, record);
+	subscription_notify(blerg->name, record);
+
 	return record;
 }
 
 int blerg_fetch(struct blerg *blerg, int record, char **data, int *length) {
 	if (record < 0) {
-		printf("Invalid record\n");
+		fprintf(stderr, "Invalid record\n");
 		return 0;
 	}
 
@@ -262,7 +275,7 @@ int blerg_fetch(struct blerg *blerg, int record, char **data, int *length) {
 	int seg_rec = record % RECORDS_PER_SEGMENT;
 
 	if ((blerg->index[seg_rec].flags & 0x1) == 0) {
-		printf("Invalid record\n");
+		fprintf(stderr, "Invalid record\n");
 		return 0;
 	}
 
@@ -275,7 +288,7 @@ int blerg_fetch(struct blerg *blerg, int record, char **data, int *length) {
 		fstat(blerg->data_fd, &st);
 		blerg->data_size = st.st_size;
 		if (rec_offset > blerg->data_size) {
-			printf("Record offset outside of data!?");
+			fprintf(stderr, "Record offset outside of data!?");
 			return 0;
 		}
 
@@ -302,7 +315,7 @@ int blerg_fetch(struct blerg *blerg, int record, char **data, int *length) {
 
 time_t blerg_get_timestamp(struct blerg *blerg, int record) {
 	if (record < 0) {
-		printf("Invalid record\n");
+		fprintf(stderr, "Invalid record\n");
 		return 0;
 	}
 
@@ -312,9 +325,17 @@ time_t blerg_get_timestamp(struct blerg *blerg, int record) {
 	int seg_rec = record % RECORDS_PER_SEGMENT;
 
 	if ((blerg->index[seg_rec].flags & 0x1) == 0) {
-		printf("Invalid record\n");
+		fprintf(stderr, "Invalid record\n");
 		return 0;
 	}
 
 	return blerg->index[seg_rec].timestamp;
 }
+
+int blerg_set_subscription_mark(struct blerg *blerg) {
+	blerg->meta->subscription_mark = subscription_count_items(blerg->name);
+}
+
+uint64_t blerg_get_subscription_mark(struct blerg *blerg) {
+	return blerg->meta->subscription_mark;
+}