Skip to content

Commit

Permalink
use greenlet 0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
mopemope committed Aug 20, 2012
1 parent 6cc8c91 commit 651b5e1
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
4 changes: 3 additions & 1 deletion meinheld/server/greenlet.h
Expand Up @@ -11,7 +11,7 @@
extern "C" {
#endif

#define GREENLET_VERSION "0.3.4"
#define GREENLET_VERSION "0.4.0"

typedef struct _greenlet {
PyObject_HEAD
Expand All @@ -28,9 +28,11 @@ typedef struct _greenlet {
PyObject* exc_type;
PyObject* exc_value;
PyObject* exc_traceback;
PyObject* dict;
} PyGreenlet;

#define PyGreenlet_Check(op) PyObject_TypeCheck(op, &PyGreenlet_Type)
#define PyGreenlet_MAIN(op) (((PyGreenlet*)(op))->stack_stop == (char*) -1)
#define PyGreenlet_STARTED(op) (((PyGreenlet*)(op))->stack_stop != NULL)
#define PyGreenlet_ACTIVE(op) (((PyGreenlet*)(op))->stack_start != NULL)
#define PyGreenlet_GET_PARENT(op) (((PyGreenlet*)(op))->parent)
Expand Down
14 changes: 14 additions & 0 deletions meinheld/server/greensupport.c
Expand Up @@ -94,3 +94,17 @@ greenlet_check(PyObject *g)
return PyGreenlet_Check((PyGreenlet*)g);
}

PyObject*
get_greenlet_dict(PyObject *o)
{
PyGreenlet *g = (PyGreenlet*)o;
if (g->dict == NULL) {
g->dict = PyDict_New();
if (g->dict == NULL){
return NULL;
}
}
Py_INCREF(g->dict);
return g->dict;
}

1 change: 1 addition & 0 deletions meinheld/server/greensupport.h
Expand Up @@ -17,5 +17,6 @@ PyObject* greenlet_throw(PyObject *g, PyObject *typ, PyObject *val, PyObject *tb
PyObject* greenlet_throw_err(PyObject *g);
int greenlet_dead(PyObject *g);
int greenlet_check(PyObject *g);
PyObject* get_greenlet_dict(PyObject *o);

#endif
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -62,7 +62,7 @@ def get_sources(path, ignore_files):
define_macros=[
("WITH_GREENLET",None),
("HTTP_PARSER_DEBUG", "0") ]
install_requires=['greenlet==0.3.4']
install_requires=['greenlet==0.4.0']

if develop:
define_macros.append(("DEVELOP",None))
Expand Down

0 comments on commit 651b5e1

Please sign in to comment.