Changeset 16

Timestamp:

04/25/07 02:06:48 (2 years ago)

Author:

hines

Message:

arg type errors as well as many other things can cause a
hoc_execerror when python is executing a hoc function.
Hoc error recovery is quite different from python and a hoc
error ends in exiting the program due to a longjmp. When
python uses the hocobj_call mechanism, we arrange the
longjmp to return to a place where we can set a python exception and
a NULL return. This may have to be turn-offable by the user if
the OcJump? causes too great a performance hit.

Files:

• branches/pygetsetcall/src/ivoc/ocjump.cpp (modified) (3 diffs)
• branches/pygetsetcall/src/ivoc/ocjump.h (modified) (1 diff)
• branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp (modified) (2 diffs)

branches/pygetsetcall/src/ivoc/ocjump.cpp

@@ -68 +68 @@
-        boolean execute(Inst* p);
-        boolean execute(const char*, Object* ob = nil);
+        void* fpycall(void*(*f)(void*, void*), void* a, void* b);
-
-/* jmpbuf is not portable and I can't figure out how get a pointer to one.
@@ -140 +141 @@
-}
-
+void* OcJump::fpycall(void*(*f)(void*, void*), void* a, void* b) {
+        return impl_->fpycall(f, a, b);
+}
+
-//-------------------------------------------------------------------
-
@@ -191 +196 @@
-        finish();
-        return true;
+}
+
+void* OcJumpImpl::fpycall(void*(*f)(void*, void*), void* a, void* b) {
+        void* c = 0;
+        begin();
+#if 1
+        if (setjmp(begin_)) {
+                restore();
+                finish();
+                return c;
+        }else
+#endif
+        {
+                c = (*f)(a, b);
+        }
+        finish();
+        return c;
-}
-

branches/pygetsetcall/src/ivoc/ocjump.h

@@ -28 +28 @@
-        boolean execute(Inst* p);
-        boolean execute(const char*, Object* ob = nil);
+        void* fpycall(void*(*)(void*, void*), void*, void*);
-        static void save_context(ObjectContext*);
-        static void restore_context(ObjectContext*);

branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp

@@ -4 +4 @@
-#include <nrnoc2iv.h>
-#include <ivoc.h>
+#include <ocjump.h>
-
-extern "C" {
@@ -262 +263 @@
-}
-
+static void* fcall(void* vself, void* vargs) {
+        PyHocObject* self = (PyHocObject*)vself;
+        if (self->ho_) {
+                hoc_push_object(self->ho_);
+        }
+        int narg = hocobj_pushargs((PyObject*)vargs);
+        if (self->ho_) {
+                self->nindex_ = narg;
+                component(self);
+                return (void*)get_final_from_stk();
+        }
+        if (self->sym_->type == BLTIN) {
+                assert(narg == 1);
+                double d = hoc_call_func(self->sym_, 1);
+                hoc_pushx(d);
+        }else{
+                Inst fc[2];
+                fc[0].sym = self->sym_;
+                fc[1].i = narg;
+                Inst* pcsav = save_pc(fc);
+                hoc_call();
+                hoc_pc = pcsav;
+        }
+        return (void*)get_final_from_stk();;
+}
+
-static PyObject* hocobj_call(PyHocObject* self, PyObject* args) {
-        if (self->type_ == 0) {
-                return nrnexec((PyObject*)self, args);
-        }else if (self->type_ == 2) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }else{
-                return NULL;