Merge pull request #92 from davidvossel/blackbox_unique_files

Blackbox unique files
ClusterLabs · Oct 8, 2013 · a8852fc · a8852fc
2 parents 7139618 + 47c690d
commit a8852fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/lib/log_blackbox.c b/lib/log_blackbox.c
@@ -136,7 +136,7 @@ qb_log_blackbox_open(struct qb_log_target *t)
 	if (t->size < 1024) {
 		return -EINVAL;
 	}
-	snprintf(t->filename, PATH_MAX, "%s-blackbox", t->name);
+	snprintf(t->filename, PATH_MAX, "%s-%d-blackbox", t->name, getpid());
 
 	t->instance = qb_rb_open(t->filename, t->size,
 				 QB_RB_FLAG_CREATE | QB_RB_FLAG_OVERWRITE, 0);

diff --git a/lib/ringbuffer.c b/lib/ringbuffer.c
@@ -112,7 +112,7 @@ do {							\
 } while (0)
 
 static void print_header(struct qb_ringbuffer_s * rb);
-static void _rb_chunk_reclaim(struct qb_ringbuffer_s * rb);
+static int _rb_chunk_reclaim(struct qb_ringbuffer_s * rb);
 
 qb_ringbuffer_t *
 qb_rb_open(const char *name, size_t size, uint32_t flags,
@@ -449,7 +449,9 @@ qb_rb_chunk_alloc(struct qb_ringbuffer_s * rb, size_t len)
 	 */
 	if (rb->flags & QB_RB_FLAG_OVERWRITE) {
 		while (qb_rb_space_free(rb) < (len + QB_RB_CHUNK_MARGIN)) {
-			_rb_chunk_reclaim(rb);
+			int rc = _rb_chunk_reclaim(rb);
+			/* reclaim failure during overwrite results in an abort. */
+			assert(rc == 0);
 		}
 	} else {
 		if (qb_rb_space_free(rb) < (len + QB_RB_CHUNK_MARGIN)) {
@@ -555,18 +557,19 @@ qb_rb_chunk_write(struct qb_ringbuffer_s * rb, const void *data, size_t len)
 	return len;
 }
 
-static void
+static int
 _rb_chunk_reclaim(struct qb_ringbuffer_s * rb)
 {
 	uint32_t old_read_pt;
 	uint32_t new_read_pt;
 	uint32_t old_chunk_size;
 	uint32_t chunk_magic;
+	int rc = 0;
 
 	old_read_pt = rb->shared_hdr->read_pt;
 	chunk_magic = QB_RB_CHUNK_MAGIC_GET(rb, old_read_pt);
 	if (chunk_magic != QB_RB_CHUNK_MAGIC) {
-		return;
+		return -EINVAL;
 	}
 
 	old_chunk_size = QB_RB_CHUNK_SIZE_GET(rb, old_read_pt);
@@ -587,7 +590,7 @@ _rb_chunk_reclaim(struct qb_ringbuffer_s * rb)
 	rb->shared_hdr->read_pt = new_read_pt;
 
 	if (rb->notifier.reclaim_fn) {
-		int rc = rb->notifier.reclaim_fn(rb->notifier.instance,
+		rc = rb->notifier.reclaim_fn(rb->notifier.instance,
 						 old_chunk_size);
 		if (rc < 0) {
 			errno = -rc;
@@ -601,6 +604,8 @@ _rb_chunk_reclaim(struct qb_ringbuffer_s * rb)
 		     old_read_pt,
 		     rb->shared_hdr->read_pt,
 		     rb->shared_hdr->write_pt);
+
+	return rc;
 }
 
 void