pre-5.10 perlio doesn't report read errors properly, skip tests

[imager.git] / context.c

diff --git a/context.c b/context.c
index 0dd70625d26e27cefcc18744dd6d39f353153bad..0598a6abf3669bc67aac931fde873d99cdff302f 100644 (file)
--- a/context.c
+++ b/context.c
@@ -1,9 +1,9 @@
 #include "imageri.h"
 #include <stdio.h>
 
-static im_slot_t slot_count;
-static im_slot_destroy_t *slot_destructors;
-static i_mutex_t slot_mutex;
+static volatile im_slot_t slot_count = 1;
+static im_slot_destroy_t *volatile slot_destructors;
+static volatile i_mutex_t slot_mutex;
 
 /*
 =item im_context_new()
@@ -105,10 +105,13 @@ im_context_refdec(im_context_t ctx, const char *where) {
   if (ctx->refcount != 0)
     return;
 
+  /* lock here to avoid slot_destructors from being moved under us */
+  i_mutex_lock(slot_mutex);
   for (slot = 0; slot < ctx->slot_alloc; ++slot) {
     if (ctx->slots[slot] && slot_destructors[slot])
       slot_destructors[slot](ctx->slots[slot]);
   }
+  i_mutex_unlock(slot_mutex);
 
   free(ctx->slots);
 
@@ -117,7 +120,7 @@ im_context_refdec(im_context_t ctx, const char *where) {
       myfree(ctx->error_stack[i].msg);
   }
 #ifdef IMAGER_LOG
-  if (ctx->lg_file)
+  if (ctx->lg_file && ctx->own_log)
     fclose(ctx->lg_file);
 #endif
 
@@ -129,6 +132,8 @@ im_context_refdec(im_context_t ctx, const char *where) {
 
 Clone an Imager context object, returning the result.
 
+The error stack is not copied from the original context.
+
 =cut
 */
 
@@ -141,36 +146,32 @@ im_context_clone(im_context_t ctx, const char *where) {
     return NULL;
 
   nctx->slot_alloc = slot_count;
-  nctx->slots = calloc(sizeof(void *), ctx->slot_alloc);
+  nctx->slots = calloc(sizeof(void *), nctx->slot_alloc);
   if (!nctx->slots) {
     free(nctx);
     return NULL;
   }
 
-  nctx->error_sp = ctx->error_sp;
+  nctx->error_sp = IM_ERROR_COUNT-1;
   for (i = 0; i < IM_ERROR_COUNT; ++i) {
-    if (ctx->error_stack[i].msg) {
-      size_t sz = ctx->error_alloc[i];
-      nctx->error_alloc[i] = sz;
-      nctx->error_stack[i].msg = mymalloc(sz);
-      memcpy(nctx->error_stack[i].msg, ctx->error_stack[i].msg, sz);
-    }
-    else {
-      nctx->error_alloc[i] = 0;
-      nctx->error_stack[i].msg = NULL;
-    }
-    nctx->error_stack[i].code = ctx->error_stack[i].code;
+    nctx->error_alloc[i] = 0;
+    nctx->error_stack[i].msg = NULL;
   }
 #ifdef IMAGER_LOG
   nctx->log_level = ctx->log_level;
   if (ctx->lg_file) {
-    /* disable buffering, this isn't perfect */
-    setvbuf(ctx->lg_file, NULL, _IONBF, 0);
-
-    /* clone that and disable buffering some more */
-    nctx->lg_file = fdopen(fileno(ctx->lg_file), "a");
-    if (nctx->lg_file)
-      setvbuf(nctx->lg_file, NULL, _IONBF, 0);
+    if (ctx->own_log) {
+      int newfd = dup(fileno(ctx->lg_file));
+      nctx->own_log = 1;
+      nctx->lg_file = fdopen(newfd, "w");
+      if (nctx->lg_file)
+       setvbuf(nctx->lg_file, NULL, _IONBF, BUFSIZ);
+    }
+    else {
+      /* stderr */
+      nctx->lg_file = ctx->lg_file;
+      nctx->own_log = 0;
+    }
   }
   else {
     nctx->lg_file = NULL;
@@ -190,15 +191,18 @@ im_context_clone(im_context_t ctx, const char *where) {
 }
 
 /*
-=item im_context_slot_new(destructor, where)
+=item im_context_slot_new(destructor)
 
 Allocate a new context-local-storage slot.
 
+C<desctructor> will be called when the context is destroyed if the
+corresponding slot is non-NULL.
+
 =cut
 */
 
 im_slot_t
-im_context_slot_new(im_slot_destroy_t destructor, const char *where) {
+im_context_slot_new(im_slot_destroy_t destructor) {
   im_slot_t new_slot;
   im_slot_destroy_t *new_destructors;
   if (!slot_mutex)
@@ -214,11 +218,6 @@ im_context_slot_new(im_slot_destroy_t destructor, const char *where) {
 
   slot_destructors[new_slot] = destructor;
 
-#ifdef IMAGER_TRACE_CONTEXT
-  fprintf(stderr, "im_context: slot %d allocated for %s\n",
-         (int)new_slot, where);
-#endif
-
   i_mutex_unlock(slot_mutex);
 
   return new_slot;
@@ -263,11 +262,6 @@ im_context_slot_set(im_context_t ctx, im_slot_t slot, void *value) {
 
   ctx->slots[slot] = value;
 
-#ifdef IMAGER_TRACE_CONTEXT
-  fprintf(stderr, "im_context: ctx %p slot %d set to %p\n",
-         ctx, (int)slot, value);
-#endif
-
   return 1;
 }
 
@@ -291,10 +285,5 @@ im_context_slot_get(im_context_t ctx, im_slot_t slot) {
   if (slot >= ctx->slot_alloc)
     return NULL;
 
-#ifdef IMAGER_TRACE_CONTEXT
-  fprintf(stderr, "im_context: ctx %p slot %d retrieved as %p\n",
-         ctx, (int)slot, ctx->slots[slot]);
-#endif
-
   return ctx->slots[slot];
 }