summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-10-24 19:13:55 -0400
committermidipix <writeonce@midipix.org>2016-11-10 23:35:52 -0500
commitdb655ef1d5f9e9c4448d2211412ade66c6e98a16 (patch)
tree9b168a44e745318e04abee58e3cabef7c7c55a1e
parentbc24681ca896900e9b61a2aa6d26b467f038815b (diff)
downloadperk-db655ef1d5f9e9c4448d2211412ade66c6e98a16.tar.bz2
perk-db655ef1d5f9e9c4448d2211412ade66c6e98a16.tar.xz
internals: error trace implementation: added pe_record_error().
-rw-r--r--project/common.mk1
-rw-r--r--project/headers.mk1
-rw-r--r--src/internal/perk_errinfo_impl.c41
-rw-r--r--src/internal/perk_errinfo_impl.h80
4 files changed, 123 insertions, 0 deletions
diff --git a/project/common.mk b/project/common.mk
index ed87f9a..3857c62 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -2,6 +2,7 @@ COMMON_SRCS = \
src/driver/pe_amain.c \
src/driver/pe_driver_ctx.c \
src/driver/pe_unit_ctx.c \
+ src/internal/perk_errinfo_impl.c \
src/logic/pe_get_image_meta.c \
src/logic/pe_map_raw_image.c \
src/output/pe_output_export_symbols.c \
diff --git a/project/headers.mk b/project/headers.mk
index 5ffbebe..705f2d3 100644
--- a/project/headers.mk
+++ b/project/headers.mk
@@ -10,6 +10,7 @@ INTERNAL_HEADERS = \
$(PROJECT_DIR)/src/internal/argv/argv.h \
$(PROJECT_DIR)/src/internal/$(PACKAGE)_driver_impl.h \
$(PROJECT_DIR)/src/internal/$(PACKAGE)_endian_impl.h \
+ $(PROJECT_DIR)/src/internal/$(PACKAGE)_errinfo_impl.h \
$(PROJECT_DIR)/src/internal/$(PACKAGE)_output_impl.h \
$(PROJECT_DIR)/src/internal/$(PACKAGE)_reader_impl.h \
diff --git a/src/internal/perk_errinfo_impl.c b/src/internal/perk_errinfo_impl.c
new file mode 100644
index 0000000..df01b3b
--- /dev/null
+++ b/src/internal/perk_errinfo_impl.c
@@ -0,0 +1,41 @@
+/***************************************************************/
+/* perk: PE Resource Kit */
+/* Copyright (C) 2015--2016 Z. Gilboa */
+/* Released under GPLv2 and GPLv3; see COPYING.PERK. */
+/***************************************************************/
+
+#include <perk/perk.h>
+#include "perk_driver_impl.h"
+#include "perk_errinfo_impl.h"
+
+int pe_record_error(
+ const struct pe_driver_ctx * dctx,
+ int syserror,
+ int liberror,
+ const char * function,
+ int line,
+ unsigned flags,
+ void * ctx)
+{
+ struct pe_driver_ctx_impl * ictx;
+ struct pe_error_info * erri;
+
+ ictx = pe_get_driver_ictx(dctx);
+
+ if (ictx->errinfp == ictx->erricap)
+ return -1;
+
+ *ictx->errinfp = &ictx->erribuf[ictx->errinfp - ictx->erriptr];
+ erri = *ictx->errinfp;
+
+ erri->syserror = syserror;
+ erri->liberror = liberror;
+ erri->function = function;
+ erri->line = line;
+ erri->flags = flags;
+ erri->ctx = ctx;
+
+ ictx->errinfp++;
+
+ return -1;
+}
diff --git a/src/internal/perk_errinfo_impl.h b/src/internal/perk_errinfo_impl.h
new file mode 100644
index 0000000..f9bd80c
--- /dev/null
+++ b/src/internal/perk_errinfo_impl.h
@@ -0,0 +1,80 @@
+/***************************************************************/
+/* perk: PE Resource Kit */
+/* Copyright (C) 2015--2016 Z. Gilboa */
+/* Released under GPLv2 and GPLv3; see COPYING.PERK. */
+/***************************************************************/
+
+#include <errno.h>
+#include <perk/perk.h>
+
+int pe_record_error(
+ const struct pe_driver_ctx *,
+ int syserror,
+ int liberror,
+ const char * function,
+ int line,
+ unsigned flags,
+ void * ctx);
+
+#define PERK_SYSTEM_ERROR(dctx) \
+ pe_record_error( \
+ dctx, \
+ errno, \
+ 0, \
+ __func__, \
+ __LINE__, \
+ PERK_ERROR_TOP_LEVEL, \
+ 0)
+
+#define PERK_BUFFER_ERROR(dctx) \
+ pe_record_error( \
+ dctx, \
+ ENOBUFS, \
+ 0, \
+ __func__, \
+ __LINE__, \
+ PERK_ERROR_TOP_LEVEL, \
+ 0)
+
+#define PERK_SPAWN_ERROR(dctx) \
+ pe_record_error( \
+ dctx, \
+ errno, \
+ 0, \
+ __func__, \
+ __LINE__, \
+ PERK_ERROR_TOP_LEVEL \
+ | (errno ? 0 \
+ : PERK_ERROR_CHILD), \
+ 0)
+
+#define PERK_FILE_ERROR(dctx) \
+ pe_record_error( \
+ dctx, \
+ EIO, \
+ 0, \
+ __func__, \
+ __LINE__, \
+ PERK_ERROR_TOP_LEVEL, \
+ 0)
+
+#define PERK_CUSTOM_ERROR(dctx,liberror) \
+ pe_record_error( \
+ dctx, \
+ 0, \
+ liberror, \
+ __func__, \
+ __LINE__, \
+ PERK_ERROR_TOP_LEVEL \
+ | PERK_ERROR_CUSTOM, \
+ 0)
+
+#define PERK_NESTED_ERROR(dctx) \
+ pe_record_error( \
+ dctx, \
+ 0, \
+ 0, \
+ __func__, \
+ __LINE__, \
+ PERK_ERROR_NESTED, \
+ 0)