summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-10-26 20:59:01 -0400
committermidipix <writeonce@midipix.org>2016-10-26 22:10:27 -0400
commitbb5e477926b1aa1732c862b34e3b515406b18bc5 (patch)
treefe4a42d5701f3409478ee9a111da50dcc98fce7d
parentbbcd7d3ba187f5b2f4ecec766436d36514a34ce4 (diff)
downloadapimagic-bb5e477926b1aa1732c862b34e3b515406b18bc5.tar.bz2
apimagic-bb5e477926b1aa1732c862b34e3b515406b18bc5.tar.xz
amgc_map_input(): added error trace support.
-rw-r--r--include/apimagic/apimagic.h2
-rw-r--r--src/driver/amgc_unit_ctx.c2
-rw-r--r--src/logic/amgc_map_input.c18
3 files changed, 13 insertions, 9 deletions
diff --git a/include/apimagic/apimagic.h b/include/apimagic/apimagic.h
index 1d51bd9..462c2f1 100644
--- a/include/apimagic/apimagic.h
+++ b/include/apimagic/apimagic.h
@@ -201,7 +201,7 @@ amgc_api void amgc_free_driver_ctx (struct amgc_driver_ctx *);
amgc_api int amgc_get_unit_ctx (const struct amgc_driver_ctx *, const char * path, struct amgc_unit_ctx **);
amgc_api void amgc_free_unit_ctx (struct amgc_unit_ctx *);
-amgc_api int amgc_map_input (int fd, const char * path, int prot, struct amgc_input *);
+amgc_api int amgc_map_input (const struct amgc_driver_ctx *, int fd, const char * path, int prot, struct amgc_input *);
amgc_api int amgc_unmap_input (struct amgc_input *);
/* driver helper api */
diff --git a/src/driver/amgc_unit_ctx.c b/src/driver/amgc_unit_ctx.c
index 7e265c0..54824e1 100644
--- a/src/driver/amgc_unit_ctx.c
+++ b/src/driver/amgc_unit_ctx.c
@@ -132,7 +132,7 @@ int amgc_get_unit_ctx(
else
ctx->ccunit.input = ftmp;
- if (amgc_map_input(fd,path,PROT_READ,&ctx->map))
+ if (amgc_map_input(dctx,fd,path,PROT_READ,&ctx->map))
return amgc_free_unit_ctx_impl(ctx,-1);
if (fd > 0)
diff --git a/src/logic/amgc_map_input.c b/src/logic/amgc_map_input.c
index 5d2f08d..b4e07ea 100644
--- a/src/logic/amgc_map_input.c
+++ b/src/logic/amgc_map_input.c
@@ -13,12 +13,14 @@
#include <sys/stat.h>
#include <apimagic/apimagic.h>
+#include "apimagic_errinfo_impl.h"
int amgc_map_input(
- int fd,
- const char * path,
- int prot,
- struct amgc_input * map)
+ const struct amgc_driver_ctx * dctx,
+ int fd,
+ const char * path,
+ int prot,
+ struct amgc_input * map)
{
struct stat st;
bool fnew;
@@ -28,13 +30,13 @@ int amgc_map_input(
fd = open(path,O_RDONLY | O_CLOEXEC);
if (fd < 0)
- return -1;
+ return AMGC_SYSTEM_ERROR(dctx);
if ((ret = fstat(fd,&st) < 0) && fnew)
close(fd);
if (ret < 0)
- return -1;
+ return AMGC_SYSTEM_ERROR(dctx);
map->size = st.st_size;
map->addr = mmap(0,map->size,prot,MAP_PRIVATE,fd,0);
@@ -42,7 +44,9 @@ int amgc_map_input(
if (fnew)
close(fd);
- return (map->addr == MAP_FAILED) ? -1 : 0;
+ return (map->addr == MAP_FAILED)
+ ? AMGC_SYSTEM_ERROR(dctx)
+ : 0;
}
int amgc_unmap_input(struct amgc_input * map)