Changeset 4798

Timestamp:

Mar 19, 2014 9:20:17 PM (11 years ago)

Author:

bennylp

Message:

Misc (re #1751): added experimental option to enable/use worker thread for Python. To enable worker thread:

• uncomment USE_THREADS in pjsip-apps/src/swig/python/Makefile
• change USE_THREADS to True in pjsip-apps/src/pygui/application.py

Location:

pjproject/trunk/pjsip-apps/src

Files:

• pygui/application.py (modified) (5 diffs)
• swig/python/Makefile (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/pygui/application.py

@@ -40 +40 @@
 import traceback
 
+# You may try to enable pjsua worker thread by setting USE_THREADS below to True *and*
+# recreate the swig module with adding -threads option to swig (uncomment USE_THREADS 
+# in swig/python/Makefile). In my experiment this would crash Python as reported in:
+# http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2014-March/017223.html
+USE_THREADS = False
         
 class Application(ttk.Frame):
@@ -46 +51 @@
         """
         def __init__(self):
+                global USE_THREADS
                 ttk.Frame.__init__(self, name='application', width=300, height=500)
                 self.pack(expand='yes', fill='both')
@@ -74 +80 @@
                 # Default config
                 self.appConfig = settings.AppConfig()
-                self.appConfig.epConfig.uaConfig.threadCnt = 0;
-                self.appConfig.epConfig.uaConfig.mainThreadOnly = True
+                if USE_THREADS:
+                        self.appConfig.epConfig.uaConfig.threadCnt = 1
+                        self.appConfig.epConfig.uaConfig.mainThreadOnly = False
+                else:
+                        self.appConfig.epConfig.uaConfig.threadCnt = 0
+                        self.appConfig.epConfig.uaConfig.mainThreadOnly = True
                 self.appConfig.epConfig.logConfig.writer = self.logger
                 self.appConfig.epConfig.logConfig.filename = "pygui.log"
@@ -102 +112 @@
         
         def start(self, cfg_file='pygui.js'):
+                global USE_THREADS
                 # Load config
                 if cfg_file and os.path.exists(cfg_file):
                         self.appConfig.loadFile(cfg_file)
 
-                self.appConfig.epConfig.uaConfig.threadCnt = 0;
+                if USE_THREADS:
+                        self.appConfig.epConfig.uaConfig.threadCnt = 1
+                        self.appConfig.epConfig.uaConfig.mainThreadOnly = False
+                else:
+                        self.appConfig.epConfig.uaConfig.threadCnt = 0
+                        self.appConfig.epConfig.uaConfig.mainThreadOnly = True
+                self.appConfig.epConfig.uaConfig.threadCnt = 0
                 self.appConfig.epConfig.uaConfig.mainThreadOnly = True
                 self.appConfig.epConfig.logConfig.writer = self.logger
@@ -137 +154 @@
                 
                 # Start polling
-                self._onTimer()
+                if not USE_THREADS:
+                        self._onTimer()
 
         def updateAccount(self, acc):

pjproject/trunk/pjsip-apps/src/swig/python/Makefile

@@ -9 +9 @@
 endif
 
-SWIG_FLAGS += -w312
+#USE_THREADS = -threads -DSWIG_NO_EXPORT_ITERATOR_METHODS
+SWIG_FLAGS += -w312 $(USE_THREADS)
 
 .PHONY: all install uninstall
@@ -23 +24 @@
 
 pjsua2_wrap.cpp: ../pjsua2.i ../symbols.i Makefile $(SRCS)
-        swig $(SWIG_FLAGS) -python  -o pjsua2_wrap.cpp ../pjsua2.i
+        swig $(SWIG_FLAGS) -python -o pjsua2_wrap.cpp ../pjsua2.i
 
 clean distclean realclean: