Move bnet_despool() into class in bsock.c

[bacula/bacula] / bacula / src / lib / pythonlib.c

diff --git a/bacula/src/lib/pythonlib.c b/bacula/src/lib/pythonlib.c
index 34d738a6cf9fb674f9a30fe6099a172b4a3c213d..c2a458a5c7b6854b58cf7ef64d5835f6628c3cf2 100644 (file)
--- a/bacula/src/lib/pythonlib.c
+++ b/bacula/src/lib/pythonlib.c
@@ -8,19 +8,32 @@
  *
  */
 /*
-   Copyright (C) 2004-2005 Kern Sibbald
+   Bacula® - The Network Backup Solution
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as amended with additional clauses defined in the
-   file LICENSE in the main source directory.
+   Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
-   the file LICENSE for additional details.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
 
- */
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 
 #include "bacula.h"
 #include "jcr.h"
@@ -30,6 +43,12 @@
 #undef _POSIX_C_SOURCE
 #include <Python.h>
 
+/* Forward referenced subroutines */
+static void init_python_lock();
+static void term_python_lock();
+void lock_python();
+void unlock_python();
+
 extern char *configfile;
 
 /* Imported subroutines */
@@ -135,6 +154,7 @@ void init_python_interpreter(const char *progname, const char *scripts,
       }
    }
    PyEval_ReleaseLock();
+   init_python_lock();
 }
 
 
@@ -144,6 +164,7 @@ void term_python_interpreter()
       Py_XDECREF(StartUp_module);
       Py_Finalize();
    }
+   term_python_lock();
 }
 
 static PyObject *set_bacula_events(PyObject *self, PyObject *args)
@@ -218,7 +239,8 @@ int generate_daemon_event(JCR *jcr, const char *event)
    }
 
    Dmsg1(100, "event=%s\n", event);
-   PyEval_AcquireLock();
+   lock_python();
+// PyEval_AcquireLock();
    if (strcmp(event, "JobStart") == 0) {
       if (!JobStart_method) {
          stat = 0;
@@ -292,10 +314,51 @@ bail_out:
    /* Fall through */
 jobstart_ok:
    Py_XDECREF(result);
-   PyEval_ReleaseLock();
+   unlock_python();
+// PyEval_ReleaseLock();
    return stat; 
 }
 
+static brwlock_t python_rwlock;
+
+static void init_python_lock()
+{
+   int errstat;
+   if ((errstat=rwl_init(&python_rwlock)) != 0) {
+      berrno be;
+      Emsg1(M_ABORT, 0, _("Unable to initialize the Python lock. ERR=%s\n"),
+            be.strerror(errstat));
+   }
+
+}
+
+static void term_python_lock()
+{
+   rwl_destroy(&python_rwlock);
+}
+
+/* This applies to a drive and to Volumes */
+void lock_python()
+{
+   int errstat;
+   if ((errstat=rwl_writelock(&python_rwlock)) != 0) {
+      berrno be;
+      Emsg2(M_ABORT, 0, "Python rwl_writelock failure. stat=%d: ERR=%s\n",
+           errstat, be.strerror(errstat));
+   }
+}
+
+void unlock_python()
+{
+   int errstat;
+   if ((errstat=rwl_writeunlock(&python_rwlock)) != 0) {
+      berrno be;
+      Emsg2(M_ABORT, 0, "Python rwl_writeunlock failure. stat=%d: ERR=%s\n",
+           errstat, be.strerror(errstat));
+   }
+}
+
+
 #else
 
 /*