Move registerRecordDeviceDriver to imports.py

Otherwise import softioc.device will seg fault
DiamondLightSource · May 5, 2021 · af652c2 · af652c2
1 parent 0448475
commit af652c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/softioc/builder.py b/softioc/builder.py
@@ -5,16 +5,6 @@
 from .softioc import dbLoadDatabase
 
 from epicsdbbuilder import *
-from epicscorelibs import path
-from epicscorelibs.ioc import \
-    iocshRegisterCommon, registerRecordDeviceDriver, pdbbase
-
-iocshRegisterCommon()
-dbLoadDatabase("base.dbd", os.path.join(path.base_path, "dbd"))
-dbLoadDatabase("devIocStats.dbd", os.path.dirname(__file__))
-
-if registerRecordDeviceDriver(pdbbase):
-    raise RuntimeError('Error registering')
 
 InitialiseDbd()
 LoadDbdFile(os.path.join(os.path.dirname(__file__), 'device.dbd'))

diff --git a/softioc/imports.py b/softioc/imports.py
@@ -7,9 +7,12 @@
 from ctypes import *
 
 from epicscorelibs import path
+from epicscorelibs.ioc import \
+    iocshRegisterCommon, registerRecordDeviceDriver, pdbbase
 
 from . import _extension
 
+
 # These are in the extension
 def get_DBF_values():
     """Return {DBF_name: DBF_int_value} mapping"""
@@ -119,6 +122,13 @@ def EpicsDll(dll):
 epicsExit = libmiscIoc.epicsExit
 epicsExit.argtypes = ()
 
+iocshRegisterCommon()
+dbLoadDatabase("base.dbd", os.path.join(path.base_path, "dbd"), None)
+dbLoadDatabase("devIocStats.dbd", os.path.dirname(__file__), None)
+
+if registerRecordDeviceDriver(pdbbase):
+    raise RuntimeError('Error registering')
+
 
 __all__ = [
     'get_field_offsets',