split out some modules and headers

diff --git a/src/debug.c b/src/debug.c
new file mode 100644 (file)
index 0000000..e4bb724
--- /dev/null
+++ b/src/debug.c
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ Copyright (c) 2018, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
+
+#include "php.h"
+#include "debug.h"
+
+#if PSI_THREADED_PARSER
+
+# include <pthread.h>
+
+static pthread_mutex_t debug_mutex;
+static pthread_mutexattr_t debug_attr;
+
+void psi_debug_lock(struct psi_data *data)
+{
+       pthread_mutex_lock(&debug_mutex);
+}
+
+void psi_debug_unlock(struct psi_data *data)
+{
+       pthread_mutex_unlock(&debug_mutex);
+}
+
+#endif
+
+PHP_MINIT_FUNCTION(psi_debug);
+PHP_MINIT_FUNCTION(psi_debug)
+{
+#if PSI_THREADED_PARSER
+       pthread_mutexattr_init(&debug_attr);
+       pthread_mutexattr_settype(&debug_attr, PTHREAD_MUTEX_RECURSIVE);
+       pthread_mutex_init(&debug_mutex, &debug_attr);
+#endif
+
+       return 0;
+}
+
+PHP_MSHUTDOWN_FUNCTION(psi_debug);
+PHP_MSHUTDOWN_FUNCTION(psi_debug)
+{
+#if PSI_THREADED_PARSER
+       pthread_mutex_destroy(&debug_mutex);
+       pthread_mutexattr_destroy(&debug_attr);
+#endif
+
+       return 0;
+}

diff --git a/src/debug.h b/src/debug.h
new file mode 100644 (file)
index 0000000..eee6d44
--- /dev/null
+++ b/src/debug.h
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ Copyright (c) 2018, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#ifndef PSI_DEBUG_H
+#define PSI_DEBUG_H
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "data.h"
+
+#if PSI_THREADED_PARSER
+void psi_debug_lock(struct psi_data *data);
+void psi_debug_unlock(struct psi_data *data);
+#else
+# define psi_debug_lock(ctx)
+# define psi_debug_unlock(ctx)
+#endif
+
+#define PSI_DEBUG_PRINT(ctx, ...) do { \
+       if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
+               psi_debug_lock(PSI_DATA(ctx)); \
+               dprintf(PSI_DATA(ctx)->debug_fd, __VA_ARGS__); \
+               psi_debug_unlock(PSI_DATA(ctx)); \
+       } \
+} while(0)
+
+#define PSI_DEBUG_PRINTV(ctx, msg, argv) do { \
+       if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
+               psi_debug_lock(PSI_DATA(ctx)); \
+               vdprintf(PSI_DATA(ctx)->debug_fd, msg, argv); \
+               psi_debug_unlock(PSI_DATA(ctx)); \
+       } \
+} while(0)
+
+#define PSI_DEBUG_DUMP(ctx, dump_func, ...) do { \
+       if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
+               struct psi_dump dump_ = {{ .fd = PSI_DATA(ctx)->debug_fd}, \
+                               .fun = (psi_dump_cb) dprintf}; \
+               psi_debug_lock(PSI_DATA(ctx)); \
+               dump_func(&dump_, __VA_ARGS__); \
+               psi_debug_unlock(PSI_DATA(ctx)); \
+       } \
+} while (0)
+
+#endif /* PSI_DEBUG_H */

diff --git a/src/dl.h b/src/dl.h
new file mode 100644 (file)
index 0000000..ee6872d
--- /dev/null
+++ b/src/dl.h
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ Copyright (c) 2018, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#ifndef PSI_DLSYM_H
+#define PSI_DLSYM_H
+
+#include <stddef.h>
+#include <dlfcn.h>
+
+#ifndef RTLD_NEXT
+# define RTLD_NEXT ((void *) -1l)
+#endif
+#ifndef RTLD_DEFAULT
+# define RTLD_DEFAULT ((void *) 0)
+#endif
+
+#include "plist.h"
+
+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;
+}
+
+static inline size_t psi_dlname(char (*buf)[], size_t *len, const char *libname)
+{
+       if (strchr(libname, '/')) {
+               return snprintf(*buf, *len, "%s", libname);
+       } else {
+               return snprintf(*buf, *len, "lib%s.%s", libname, PHP_PSI_SHLIB_SUFFIX);
+       }
+}
+
+static inline void *psi_dlopen(const char *libname)
+{
+       return dlopen(libname, RTLD_LAZY | RTLD_LOCAL);
+}
+
+static inline void psi_dlclose(void *dl)
+{
+       dlclose(dl);
+}
+
+static inline char *psi_dlerror()
+{
+       return dlerror();
+}
+
+#endif /* PSI_DLSYM_H */

diff --git a/src/dump.c b/src/dump.c
new file mode 100644 (file)
index 0000000..268353e
--- /dev/null
+++ b/src/dump.c
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ Copyright (c) 2018, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
+
+#include "dump.h"
+
+const struct psi_dump psi_dump_stdout = {
+               .ctx.fd = STDOUT_FILENO,
+               .fun = (psi_dump_cb) dprintf
+};
+
+const struct psi_dump psi_dump_stderr = {
+               .ctx.fd = STDERR_FILENO,
+               .fun = (psi_dump_cb) dprintf
+};
+

diff --git a/src/dump.h b/src/dump.h
new file mode 100644 (file)
index 0000000..a887f3d
--- /dev/null
+++ b/src/dump.h
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ Copyright (c) 2018, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#ifndef PSI_DUMP_H
+#define PSI_DUMP_H
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+union psi_dump_arg {
+       void *hn;
+       int fd;
+};
+
+typedef int (*psi_dump_cb)(union psi_dump_arg, const char *msg, ...);
+
+struct psi_dump {
+       union psi_dump_arg ctx;
+       psi_dump_cb fun;
+};
+
+const struct psi_dump psi_dump_stdout;
+const struct psi_dump psi_dump_stderr;
+
+#define PSI_DUMP(dump, ...) do { \
+       const struct psi_dump *_dump_ptr = dump; \
+       if (!_dump_ptr) { \
+               _dump_ptr = &psi_dump_stdout; \
+       } \
+       _dump_ptr->fun(_dump_ptr->ctx, __VA_ARGS__); \
+} while(0)
+
+
+#endif /* PSI_DUMP_H */