X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fdata.h;h=9caeb5920250dec86ffeab18082ebbb6b321cb77;hp=1d8414f8b231b03fd0d8166c5a02d560dbe3ea66;hb=refs%2Fheads%2Fmaster;hpb=a7ac1c0a3c855321f21682c127a4b707de33a303

diff --git a/src/data.h b/src/data.h
index 1d8414f..9caeb59 100644
--- a/src/data.h
+++ b/src/data.h
@@ -30,70 +30,24 @@
 #include "error.h"
 #include "plist.h"
 #include "validate.h"
-
-#define PSI_DEBUG 0x1
-#define PSI_SILENT 0x2
+#include "dump.h"
+#include "debug.h"
 
 #include <stdarg.h>
 #include <dlfcn.h>
+#include <unistd.h>
 
-#ifndef RTLD_NEXT
-# define RTLD_NEXT ((void *) -1l)
-#endif
-#ifndef RTLD_DEFAULT
-# define RTLD_DEFAULT ((void *) 0)
-#endif
-
-static inline void *psi_dlsym(struct psi_plist *dllist, const char *name, const char *redir)
-{
-	void *dl, *sym = NULL;
-	const char *test = redir ?: name;
-
-again:
-	if (dllist) {
-		size_t i = 0;
-
-		while (!sym && psi_plist_get(dllist, i++, &dl)) {
-			sym = dlsym(dl, test);
-		}
-	}
-	if (!sym) {
-		sym = dlsym(RTLD_DEFAULT, test);
-	}
-	if (!sym && test == redir) {
-		test = name;
-		goto again;
-	}
-
-	return sym;
-}
+#define PSI_DEBUG 0x1
+#define PSI_SILENT 0x2
 
-#define PSI_DEBUG_PRINT(ctx, ...) do { \
-	if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
-		dprintf(PSI_DATA(ctx)->debug_fd, __VA_ARGS__); \
-	} \
-} while(0)
-#define PSI_DEBUG_PRINTV(ctx, msg, argv) do { \
-	if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
-		vdprintf(PSI_DATA(ctx)->debug_fd, msg, argv); \
-	} \
-} while(0)
-#define PSI_DEBUG_DUMP(ctx, dump_func, ...) do { \
-	if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
-		dump_func(PSI_DATA(ctx)->debug_fd, __VA_ARGS__); \
-	} \
-} while (0)
+#if PSI_THREADED_PARSER
+zend_string *psi_string_init_interned(const char *buf, size_t len, int p);
+zend_string *psi_new_interned_string(zend_string *str);
+#else
+# define psi_string_init_interned zend_string_init_interned
+# define psi_new_interned_string zend_new_interned_string
+#endif
 
-union psi_dump_arg {
-	void *hn;
-	int fd;
-};
-typedef void (*psi_dump_cb)(union psi_dump_arg, const char *msg, ...);
-struct psi_dump {
-	union psi_dump_arg ctx;
-	psi_dump_cb fun;
-};
-#define PSI_DUMP(dump, ...) (dump)->fun((dump)->ctx, __VA_ARGS__)
 
 #define PSI_DATA(D) ((struct psi_data *) (D))
 
@@ -121,6 +75,6 @@ struct psi_data *psi_data_ctor(struct psi_data *data, psi_error_cb error, unsign
 struct psi_data *psi_data_ctor_with_dtors(struct psi_data *data, psi_error_cb error, unsigned flags);
 struct psi_data *psi_data_exchange(struct psi_data *dest, struct psi_data *src);
 void psi_data_dtor(struct psi_data *data);
-void psi_data_dump(int fd, struct psi_data *data);
+void psi_data_dump(struct psi_dump *dump, struct psi_data *data);
 
 #endif