projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.3
[collectd.git]
/
src
/
cpython.h
diff --git
a/src/cpython.h
b/src/cpython.h
index
8c7ad65
..
4b8aa72
100644
(file)
--- a/
src/cpython.h
+++ b/
src/cpython.h
@@
-24,6
+24,10
@@
* Sven Trenkel <collectd at semidefinite.de>
**/
* Sven Trenkel <collectd at semidefinite.de>
**/
+/* Some python versions don't include this by default. */
+
+#include <longintrepr.h>
+
/* These two macros are basicly Py_BEGIN_ALLOW_THREADS and Py_BEGIN_ALLOW_THREADS
* from the other direction. If a Python thread calls a C function
* Py_BEGIN_ALLOW_THREADS is used to allow other python threads to run because
/* These two macros are basicly Py_BEGIN_ALLOW_THREADS and Py_BEGIN_ALLOW_THREADS
* from the other direction. If a Python thread calls a C function
* Py_BEGIN_ALLOW_THREADS is used to allow other python threads to run because
@@
-101,12
+105,26
@@
#define PyInt_FromLong PyLong_FromLong
#define CPY_INIT_TYPE PyVarObject_HEAD_INIT(NULL, 0)
#define IS_BYTES_OR_UNICODE(o) (PyUnicode_Check(o) || PyBytes_Check(o))
#define PyInt_FromLong PyLong_FromLong
#define CPY_INIT_TYPE PyVarObject_HEAD_INIT(NULL, 0)
#define IS_BYTES_OR_UNICODE(o) (PyUnicode_Check(o) || PyBytes_Check(o))
-#define CPY_STRCAT PyUnicode_Concat
+#define CPY_STRCAT_AND_DEL(a, b) do {\
+ CPY_STRCAT((a), (b));\
+ Py_XDECREF((b));\
+} while (0)
+static inline void CPY_STRCAT(PyObject **a, PyObject *b) {
+ PyObject *ret;
+
+ if (!a || !*a)
+ return;
+
+ ret = PyUnicode_Concat(*a, b);
+ Py_DECREF(*a);
+ *a = ret;
+}
#else
#define CPY_INIT_TYPE PyObject_HEAD_INIT(NULL) 0,
#define IS_BYTES_OR_UNICODE(o) (PyUnicode_Check(o) || PyString_Check(o))
#else
#define CPY_INIT_TYPE PyObject_HEAD_INIT(NULL) 0,
#define IS_BYTES_OR_UNICODE(o) (PyUnicode_Check(o) || PyString_Check(o))
+#define CPY_STRCAT_AND_DEL PyString_ConcatAndDel
#define CPY_STRCAT PyString_Concat
#endif
#define CPY_STRCAT PyString_Concat
#endif
@@
-120,7
+138,11
@@
static inline const char *cpy_unicode_or_bytes_to_string(PyObject **o) {
Py_DECREF(*o);
*o = tmp;
}
Py_DECREF(*o);
*o = tmp;
}
+#ifdef IS_PY3K
return PyBytes_AsString(*o);
return PyBytes_AsString(*o);
+#else
+ return PyString_AsString(*o);
+#endif
}
static inline PyObject *cpy_string_to_unicode_or_bytes(const char *buf) {
}
static inline PyObject *cpy_string_to_unicode_or_bytes(const char *buf) {
@@
-131,11
+153,15
@@
static inline PyObject *cpy_string_to_unicode_or_bytes(const char *buf) {
if (ret != NULL)
return ret;
PyErr_Clear();
if (ret != NULL)
return ret;
PyErr_Clear();
-#endif
return PyBytes_FromString(buf);
return PyBytes_FromString(buf);
+#else
+ return PyString_FromString(buf);
+#endif
}
}
- /* Python object declarations. */
+void cpy_log_exception(const char *context);
+
+/* Python object declarations. */
typedef struct {
PyObject_HEAD /* No semicolon! */
typedef struct {
PyObject_HEAD /* No semicolon! */
@@
-144,7
+170,6
@@
typedef struct {
PyObject *values; /* Sequence */
PyObject *children; /* Sequence */
} Config;
PyObject *values; /* Sequence */
PyObject *children; /* Sequence */
} Config;
-
PyTypeObject ConfigType;
typedef struct {
PyTypeObject ConfigType;
typedef struct {
@@
-156,21
+181,29
@@
typedef struct {
char type[DATA_MAX_NAME_LEN];
char type_instance[DATA_MAX_NAME_LEN];
} PluginData;
char type[DATA_MAX_NAME_LEN];
char type_instance[DATA_MAX_NAME_LEN];
} PluginData;
-
PyTypeObject PluginDataType;
PyTypeObject PluginDataType;
+#define PluginData_New() PyObject_CallFunctionObjArgs((PyObject *) &PluginDataType, (void *) 0)
typedef struct {
PluginData data;
PyObject *values; /* Sequence */
typedef struct {
PluginData data;
PyObject *values; /* Sequence */
- int interval;
+ PyObject *meta; /* dict */
+ double interval;
} Values;
} Values;
-
PyTypeObject ValuesType;
PyTypeObject ValuesType;
+#define Values_New() PyObject_CallFunctionObjArgs((PyObject *) &ValuesType, (void *) 0)
typedef struct {
PluginData data;
int severity;
char message[NOTIF_MAX_MSG_LEN];
} Notification;
typedef struct {
PluginData data;
int severity;
char message[NOTIF_MAX_MSG_LEN];
} Notification;
-
PyTypeObject NotificationType;
PyTypeObject NotificationType;
+#define Notification_New() PyObject_CallFunctionObjArgs((PyObject *) &NotificationType, (void *) 0)
+
+typedef PyLongObject Signed;
+PyTypeObject SignedType;
+
+typedef PyLongObject Unsigned;
+PyTypeObject UnsignedType;
+