Merge pull request #389 from abergeron/error_ctx

Add better error reporting from the backends

Author: nouiz

Makefile

@@ -11,7 +11,7 @@ debug: install-debugc py
 
 .PHONY: install-debugc py debug install-relc rel config
 
-Debug/Makefile: Debug Makefile.conf
+Debug/Makefile: Makefile.conf
 	mkdir -p Debug
 ifndef INSTALL_PREFIX
 	(cd Debug && NUM_DEVS=${NUM_DEVS} DEV_NAMES=${DEV_NAMES} cmake .. -DCMAKE_BUILD_TYPE=Debug)

src/cache.h

@@ -5,6 +5,7 @@
 #include <gpuarray/config.h>
 #include "private_config.h"
 #include "util/strb.h"
+#include "util/error.h"
 
 typedef void *cache_key_t;
 typedef void *cache_value_t;
@@ -77,16 +78,19 @@ struct _cache {
 
 cache *cache_lru(size_t max_size, size_t elasticity,
                  cache_eq_fn keq, cache_hash_fn khash,
-                 cache_freek_fn kfree, cache_freev_fn vfree);
+                 cache_freek_fn kfree, cache_freev_fn vfree,
+                 error *e);
 
 cache *cache_twoq(size_t hot_size, size_t warm_size,
                   size_t cold_size, size_t elasticity,
                   cache_eq_fn keq, cache_hash_fn khash,
-                  cache_freek_fn kfree, cache_freev_fn vfree);
+                  cache_freek_fn kfree, cache_freev_fn vfree,
+                  error *e);
 
 cache *cache_disk(const char *dirpath, cache *mem,
                   kwrite_fn kwrite, vwrite_fn vwrite,
-                  kread_fn kread, vread_fn vread);
+                  kread_fn kread, vread_fn vread,
+                  error *e);
 
 /* API functions */
 static inline int cache_add(cache *c, cache_key_t k, cache_value_t v) {

src/cache/disk.c

@@ -397,7 +397,7 @@ static void disk_destroy(cache *_c) {
 
 cache *cache_disk(const char *dirpath, cache *mem,
                   kwrite_fn kwrite, vwrite_fn vwrite,
-                  kread_fn kread, vread_fn vread) {
+                  kread_fn kread, vread_fn vread, error *e) {
   struct stat st;
   disk_cache *res;
   char *dirp;
@@ -414,7 +414,10 @@ cache *cache_disk(const char *dirpath, cache *mem,
 
   dirp = malloc(dirl + 1);  /* With the NUL */
 
-  if (dirp == NULL) return NULL;
+  if (dirp == NULL) {
+    error_sys(e, "malloc");
+    return NULL;
+  }
 
   strlcpy(dirp, dirpath, dirl + 1);
 
@@ -425,6 +428,7 @@ cache *cache_disk(const char *dirpath, cache *mem,
 
   if (ensurep(NULL, dirp) != 0) {
     free(dirp);
+    error_sys(e, "ensurep");
     return NULL;
   }
 
@@ -433,18 +437,24 @@ cache *cache_disk(const char *dirpath, cache *mem,
 
   mkdir(dirp, 0777); /* This may fail, but it's ok */
 
-  if (lstat(dirp, &st) != 0)
+  if (lstat(dirp, &st) != 0) {
+    error_sys(e, "lstat");
     return NULL;
+  }
 
   /* Restore the good path at the end */
   dirp[dirl - 1] = sep;
 
-  if (!(st.st_mode & S_IFDIR))
+  if (!(st.st_mode & S_IFDIR)) {
+    error_set(e, GA_SYS_ERROR, "Cache path exists but is not a directory");
     return NULL;
+  }
 
   res = calloc(sizeof(*res), 1);
-  if (res == NULL)
+  if (res == NULL) {
+    error_sys(e, "calloc");
     return NULL;
+  }
 
   res->dirp = dirp;
   res->mem = mem;

src/cache/lru.c

@@ -127,10 +127,11 @@ static inline size_t roundup2(size_t s) {
   return s;
 }
 
-static inline int hash_init(hash *h, size_t size) {
+static inline int hash_init(hash *h, size_t size, error *e) {
   h->nbuckets = roundup2(size + (size/6));
   h->keyval = calloc(h->nbuckets, sizeof(*h->keyval));
   if (h->keyval == NULL) {
+    error_sys(e, "calloc");
     return -1;
   }
   h->size = 0;
@@ -276,11 +277,15 @@ static void lru_destroy(cache *_c) {
 
 cache *cache_lru(size_t max_size, size_t elasticity,
                  cache_eq_fn keq, cache_hash_fn khash,
-                 cache_freek_fn kfree, cache_freev_fn vfree) {
+                 cache_freek_fn kfree, cache_freev_fn vfree,
+                 error *e) {
   lru_cache *res = malloc(sizeof(*res));
-  if (res == NULL) return NULL;
+  if (res == NULL) {
+    error_sys(e, "malloc");
+    return NULL;
+  }
 
-  if (hash_init(&res->data, max_size+elasticity)) {
+  if (hash_init(&res->data, max_size+elasticity, e)) {
     free(res);
     return NULL;
   }

src/cache/twoq.c

@@ -1,6 +1,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <gpuarray/error.h>
+
 #include "cache.h"
 #include "private_config.h"
 
@@ -135,10 +137,11 @@ static inline size_t roundup2(size_t s) {
   return s;
 }
 
-static inline int hash_init(hash *h, size_t size) {
+static inline int hash_init(hash *h, size_t size, error *e) {
   h->nbuckets = roundup2(size + (size/6));
   h->keyval = calloc(h->nbuckets, sizeof(*h->keyval));
   if (h->keyval == NULL) {
+    error_sys(e, "calloc");
     return -1;
   }
   h->size = 0;
@@ -322,16 +325,21 @@ static void twoq_destroy(cache *_c) {
 }
 
 cache *cache_twoq(size_t hot_size, size_t warm_size, size_t cold_size,
-                 size_t elasticity, cache_eq_fn keq, cache_hash_fn khash,
-                 cache_freek_fn kfree, cache_freev_fn vfree) {
+                  size_t elasticity, cache_eq_fn keq, cache_hash_fn khash,
+                  cache_freek_fn kfree, cache_freev_fn vfree, error *e) {
   twoq_cache *res;
-  if (hot_size == 0 || warm_size == 0 || cold_size == 0)
+  if (hot_size == 0 || warm_size == 0 || cold_size == 0) {
+    error_set(e, GA_VALUE_ERROR, "cache_twoq: section size is 0");
     return NULL;
+  }
 
   res = malloc(sizeof(*res));
-  if (res == NULL) return NULL;
+  if (res == NULL) {
+    error_sys(e, "malloc");
+    return NULL;
+  }
 
-  if (hash_init(&res->data, hot_size+warm_size+cold_size+elasticity)) {
+  if (hash_init(&res->data, hot_size+warm_size+cold_size+elasticity, e)) {
     free(res);
     return NULL;
   }

src/gpuarray/buffer.h

@@ -500,7 +500,7 @@ GPUARRAY_PUBLIC int gpukernel_call(gpukernel *k, unsigned int n,
  *
  * This can be use to cache kernel binaries after compilation of a
  * specific device.  The kernel can be recreated by calling
- * kernel_alloc with the binary and size and passing `GA_USE_BINARY`
+ * gpukernel_alloc with the binary and size and passing `GA_USE_BINARY`
  * as the use flags.
  *
  * The returned pointer is allocated and must be freed by the caller.

src/gpuarray_array.c

@@ -71,7 +71,8 @@ static int ga_extcopy(GpuArray *dst, const GpuArray *src) {
     if (ctx->extcopy_cache == NULL)
       ctx->extcopy_cache = cache_twoq(4, 8, 8, 2, extcopy_eq, extcopy_hash,
                                       extcopy_free,
-                                      (cache_freev_fn)GpuElemwise_free);
+                                      (cache_freev_fn)GpuElemwise_free,
+                                      ctx->err);
     if (ctx->extcopy_cache == NULL)
       return GA_MISC_ERROR;
     if (cache_add(ctx->extcopy_cache, aa, k) != 0)