Improve cpu usage on message waiting.

Author: alejandroinfante

bridge_hooks.py

@@ -1,7 +1,6 @@
 from flask import Flask, request
 import http.client
 import argparse
-import threading
 import sys
 import traceback
 from PythonBridge import bridge_globals

flask_platform.py

@@ -5,6 +5,7 @@
 from PythonBridge import bridge_globals, json_encoder, bridge_utils
 import sys
 import logging
+import requests
 
 class FlaskMsgService:
 
@@ -18,6 +19,8 @@ def __init__(self, port, pharo_port, feed_callback):
         self.feed_callback = feed_callback
         self.app = Flask('PythonBridge')
         self.app.use_reloader=False
+        self.session = requests.Session()
+        self.session.trust_env = True
 
         @self.app.route("/ENQUEUE", methods=["POST"])
         def eval_expression():
@@ -56,11 +59,11 @@ def send_async_message(self, msg):
     def send_sync_message(self, msg):
         msg['__sync'] = bridge_utils.random_str()
         bridge_globals.logger.log("SYNC_MSG: " + json.dumps(msg))
-        conn = http.client.HTTPConnection("localhost", str(self.pharo_port))
-        conn.request("POST", "/" + msg["type"], json.dumps(msg), {
-            "Content-type": "application/json",
-            "Accept": "text/plain"})
-        response =  str(conn.getresponse().read().decode())
+        response = self.session.post(
+            'http://localhost:' + str(self.pharo_port) + '/' + msg['type'], 
+            data=json.dumps(msg),
+            headers={'content-type': 'application/json'}, 
+            allow_redirects=True).content.decode('utf-8')
         bridge_globals.logger.log("SYNC_ANS: " + response)
         return json.loads(response)
 

msgpack_socket_platform.py

@@ -3,6 +3,7 @@
 import _thread
 import threading
 import time
+import sys
 from PythonBridge import bridge_globals, stoppable_thread, msgpack_serializer
 from uuid import uuid1
 
@@ -28,12 +29,20 @@ def set_handler(self, msg_type, async_handler):
 
     def prim_handle(self):
         try:
+            bridge_globals.logger.log("loop func")
             data = self.client.recv(2048)
-            self.unpacker.feed(data)
-            for msg in self.unpacker:
-                self.prim_handle_msg(msg)
+            if len(data) == 0:
+                time.sleep(0.005)
+            else:
+                self.unpacker.feed(data)
+                for msg in self.unpacker:
+                    bridge_globals.logger.log("prim handle message")
+                    self.prim_handle_msg(msg)
         except OSError:
-            self.thread.stop()
+            bridge_globals.logger.log("OSError: " + str(err))
+            self.stop()
+            sys.exit()
+            exit(-1)
         except Exception as err:
             bridge_globals.logger.log("ERROR message: " + str(err))
 

python_bridge.py

@@ -127,10 +127,8 @@ def run_bridge():
 
 	bridge_globals.pharoPort = args["pharo"]
 	if args["log"]:
-		print("YES LOG")
 		bridge_globals.logger = Logger()
 	else:
-		print("NO LOG")
 		bridge_globals.logger = NoLogger()
 	bridge_globals.pyPort = args["port"]
 	bridge_globals.globalCommandList = PythonCommandList()