From 40fb62a14231717180f958ea299c70918b64284e Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Sat, 30 Mar 2013 14:24:06 -0400
Subject: [PATCH] pass processing reason

---
 devsupApp/src/dbdset.c   | 33 ++++++++++++++++++++++++++++++---
 devsupApp/src/dbrec.c    |  9 +++++++--
 devsupApp/src/pydevsup.h |  2 ++
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/devsupApp/src/dbdset.c b/devsupApp/src/dbdset.c
index 32eb69d..bdefdf8 100644
--- a/devsupApp/src/dbdset.c
+++ b/devsupApp/src/dbdset.c
@@ -30,6 +30,8 @@ typedef struct {
 
     PyObject *pyrecord;
     PyObject *support;
+
+    PyObject *reason;
 } pyDevice;
 
 static long parse_link(dbCommon *prec, const char* src)
@@ -80,12 +82,16 @@ static long detach_common(dbCommon *prec)
     return ret;
 }
 
-static long process_common(dbCommon *prec, int cause)
+static long process_common(dbCommon *prec)
 {
     pyDevice *priv = prec->dpvt;
+    PyObject *cause = priv->reason;
     PyObject *ret;
 
-    ret = PyObject_CallMethod(priv->support, "process", "Oi", priv->pyrecord, cause);
+    if(!cause)
+        cause = Py_None;
+
+    ret = PyObject_CallMethod(priv->support, "process", "OO", priv->pyrecord, cause);
     if(!ret)
         return -1;
     Py_DECREF(ret);
@@ -215,7 +221,7 @@ static long process_record(dbCommon *prec)
         return 0;
     pystate = PyGILState_Ensure();
 
-    if(process_common(prec, 0)) {
+    if(process_common(prec)) {
         fprintf(stderr, "%s: Exception in process_record\n", prec->name);
         PyErr_Print();
         PyErr_Clear();
@@ -225,6 +231,27 @@ static long process_record(dbCommon *prec)
     return 0;
 }
 
+int setCausePyRecord(dbCommon *prec, PyObject *reason)
+{
+    pyDevice *priv=prec->dpvt;
+    if(!isPyRecord(prec) || !priv || priv->reason)
+        return 0;
+    Py_INCREF(reason);
+    priv->reason = reason;
+    return 1;
+}
+
+int clearCausePyRecord(dbCommon *prec)
+{
+    pyDevice *priv=prec->dpvt;
+    if(!isPyRecord(prec) || !priv || !priv->reason)
+        return 0;
+    Py_DECREF(priv->reason);
+    priv->reason = NULL;
+    return 1;
+}
+
+
 static dsxt pydevsupExt = {&add_record, &del_record};
 
 
diff --git a/devsupApp/src/dbrec.c b/devsupApp/src/dbrec.c
index 92c6556..5088c96 100644
--- a/devsupApp/src/dbrec.c
+++ b/devsupApp/src/dbrec.c
@@ -123,15 +123,18 @@ static PyObject* pyRecord_scan(pyRecord *self, PyObject *args, PyObject *kws)
 {
     dbCommon *prec = self->entry.precnode->precord;
 
-    static char* names[] = {"sync", NULL};
+    static char* names[] = {"sync", "reason", NULL};
+    PyObject *reason = Py_None;
     PyObject *sync = Py_False;
 
-    if(!PyArg_ParseTupleAndKeywords(args, kws, "|O", names, &sync))
+    if(!PyArg_ParseTupleAndKeywords(args, kws, "|OO", names, &sync, &reason))
         return NULL;
 
     if(!PyObject_IsTrue(sync)) {
         scanOnce(prec);
     } else {
+        setCausePyRecord(prec, reason);
+
         Py_BEGIN_ALLOW_THREADS {
 
             dbScanLock(prec);
@@ -139,6 +142,8 @@ static PyObject* pyRecord_scan(pyRecord *self, PyObject *args, PyObject *kws)
             dbScanUnlock(prec);
 
         } Py_END_ALLOW_THREADS
+
+        clearCausePyRecord(prec);
     }
 
     Py_RETURN_NONE;
diff --git a/devsupApp/src/pydevsup.h b/devsupApp/src/pydevsup.h
index b211985..9e3a957 100644
--- a/devsupApp/src/pydevsup.h
+++ b/devsupApp/src/pydevsup.h
@@ -9,5 +9,7 @@ int pyRecord_prepare(void);
 void pyRecord_setup(PyObject *module);
 
 int isPyRecord(dbCommon *);
+int setCausePyRecord(dbCommon *, PyObject *);
+int clearCausePyRecord(dbCommon *);
 
 #endif // PYDEVSUP_H