Changeset 51bb400466101d3a545817ba7e27f9d25568ab51

Timestamp:

07/04/09 01:15:59 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

b05530c4ff96e00046ae4e9555794b66265081b2

Parents:

c6dad257c20c3ef9c3f58a6f82ce1d1077782fe6

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2009-07-04T01:15:59Z+0300

Message:

Switch from liblo to unix pipes

Files:

• lv2_ui.c (modified) (10 diffs)
• ui (modified) (5 diffs)

lv2_ui.c

@@ -33 +33 @@
 #include <sys/types.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include <locale.h>
 #include <errno.h>
-
-#include <lo/lo.h>
 
 #include <lv2.h>
@@ -41 +41 @@
 #include "lv2_external_ui.h"
 
-#define MAX_OSC_PATH 1024
-
 struct control
 {
@@ -51 +49 @@
   void (* ui_closed)(LV2UI_Controller controller);
 
-  lo_server osc_server;
-
   bool running;              /* true if UI launched and 'exiting' not received */
   bool visible;              /* true if 'show' sent */
 
-  lo_address osc_address;    /* non-NULL if 'update' received */
-
-  char osc_control_path[MAX_OSC_PATH];
-  char osc_hide_path[MAX_OSC_PATH];
-  char osc_quit_path[MAX_OSC_PATH];
-  char osc_show_path[MAX_OSC_PATH];
+  int send_pipe;             /* the pipe end that is used for sending messages to UI */
+  int recv_pipe;             /* the pipe end that is used for receiving messages from UI */
 };
 
-#undef control_ptr
-
-static
-int
-osc_debug_handler(
-  const char * path,
-  const char * types,
-  lo_arg ** argv,
-  int argc,
-  void * data,
-  void * user_data)
-{
-  int i;
-
-  printf("got unhandled OSC message:\n");
-  printf("path: <%s>\n", path);
-  fflush(stdout);
-  for (i = 0; i < argc; i++)
-  {
-    printf("arg %d '%c' ", i, types[i]);
-    lo_arg_pp(types[i], argv[i]);
-    printf("\n");
-  }
-  fflush(stdout);
-
-  return 1;
-}
-
-int
-osc_exiting_handler(
-  struct control * control_ptr,
-  lo_arg ** argv)
-{
-  //printf("OSC: got UI exit notification\n");
-
-  control_ptr->running = false;
-  control_ptr->visible = false;
-
-  if (control_ptr->osc_address)
-  {
-    lo_address_free(control_ptr->osc_address);
-  }
-
-  control_ptr->ui_closed(control_ptr->controller);
-
-  return 0;
-}
-
-int
-osc_control_handler(
-  struct control * control_ptr,
-  lo_arg ** argv)
-{
-  int port = argv[0]->i;
-  float value = argv[1]->f;
-
-  //printf("OSC control handler: port %d = %f\n", port, value);
-
-  control_ptr->write_function(control_ptr->controller, (uint32_t)port, sizeof(float), 0, &value);
-
-  return 0;
-}
-
-int
-osc_update_handler(
-  struct control * control_ptr,
-  lo_arg ** argv)
-{
-  const char * url = &argv[0]->s;
-  char * path;
-  char * host;
-  char * port;
-
-  //printf("OSC: got update request from <%s>\n", url);
-
-  if (control_ptr->osc_address)
-  {
-    return 0;
-  }
-
-  host = lo_url_get_hostname(url);
-  port = lo_url_get_port(url);
-  control_ptr->osc_address = lo_address_new(host, port);
-  free(host);
-  free(port);
-
-  path = lo_url_get_path(url);
-
-  sprintf(control_ptr->osc_control_path, "%scontrol", path);
-  sprintf(control_ptr->osc_hide_path, "%shide", path);
-  sprintf(control_ptr->osc_show_path, "%sshow", path);
-  sprintf(control_ptr->osc_quit_path, "%squit", path);
-
-  free(path);
-
-  control_ptr->running = true;
-
-  return 0;
-}
-
-#define control_ptr ((struct control *)user_data)
-
-static
-int
-osc_message_handler(
-  const char * path,
-  const char * types,
-  lo_arg ** argv,
-  int argc,
-  void * data,
-  void * user_data)
-{
-  const char *method;
-
-  method = path;
-  if (method[0] != '/' || method[1] != '/')
-    return osc_debug_handler(path, types, argv, argc, data, user_data);
-  method += 2;
-
-  if (!strcmp(method, "update") && argc == 1 && !strcmp(types, "s"))
-  {
-    return osc_update_handler(control_ptr, argv);
-  }
-  else if (!strcmp(method, "control") && argc == 2 && !strcmp(types, "if"))
-  {
-    return osc_control_handler(control_ptr, argv);
-  }
-  else if (!strcmp(method, "exiting") && argc == 0)
-  {
-    return osc_exiting_handler(control_ptr, argv);
-  }
-
-  return osc_debug_handler(path, types, argv, argc, data, user_data);
-}
-
-#undef control_ptr
+static
+char *
+read_line(
+  struct control * control_ptr)
+{
+  ssize_t ret;
+  char ch;
+  char buf[100];
+  char * ptr;
+
+  ptr = buf;
+
+loop:
+  ret = read(control_ptr->recv_pipe, &ch, 1);
+  if (ret == 1 && ch != '\n')
+  {
+    *ptr++ = ch;
+    goto loop;
+  }
+
+  if (ptr != buf)
+  {
+    *ptr = 0;
+    //printf("recv: \"%s\"\n", buf);
+    return strdup(buf);
+  }
+
+  return NULL;
+}
 
 #define control_ptr ((struct control *)_this_)
@@ -208 +93 @@
   struct lv2_external_ui * _this_)
 {
+  char * msg;
+  char * port_index_str;
+  char * port_value_str;
+  int port;
+  float value;
+  char * locale;
+
   //printf("run() called\n");
-  while (lo_server_recv_noblock(control_ptr->osc_server, 0) != 0) {}
+
+  msg = read_line(control_ptr);
+  if (msg == NULL)
+  {
+    return;
+  }
+
+  locale = strdup(setlocale(LC_NUMERIC, NULL));
+  setlocale(LC_NUMERIC, "POSIX");
+
+  if (!strcmp(msg, "port_value"))
+  {
+    port_index_str = read_line(control_ptr);
+    port_value_str = read_line(control_ptr);
+
+    port = atoi(port_index_str);
+    if (sscanf(port_value_str, "%f", &value) == 1)
+    {
+      //printf("port %d = %f\n", port, value);
+      control_ptr->write_function(control_ptr->controller, (uint32_t)port, sizeof(float), 0, &value);
+    }
+    else
+    {
+      fprintf(stderr, "failed to convert \"%s\" to float\n", port_value_str);
+    }
+
+    free(port_index_str);
+    free(port_value_str);
+  }
+  else if (!strcmp(msg, "exiting"))
+  {
+    //printf("got UI exit notification\n");
+    control_ptr->running = false;
+    control_ptr->visible = false;
+    control_ptr->ui_closed(control_ptr->controller);
+  }
+  else
+  {
+    printf("unknown message: \"%s\"\n", msg);
+  }
+
+  setlocale(LC_NUMERIC, locale);
+  free(locale);
+
+  free(msg);
 }
 
@@ -224 +160 @@
   }
 
-  if (control_ptr->osc_address)
-  {
-    lo_send(control_ptr->osc_address, control_ptr->osc_show_path, "");
-    control_ptr->visible = true;
-  }
+  write(control_ptr->send_pipe, "show\n", 5);
+  control_ptr->visible = true;
 }
 
@@ -238 +171 @@
   //printf("hide() called\n");
 
-  if (!control_ptr->visible || !control_ptr->osc_address)
+  if (!control_ptr->visible)
   {
     return;
   }
 
-  lo_send(control_ptr->osc_address, control_ptr->osc_hide_path, "");
+  write(control_ptr->send_pipe, "hide\n", 5);
   control_ptr->visible = false;
 }
@@ -263 +196 @@
   struct lv2_external_ui_host * ui_host_ptr;
   char * filename;
-  char * osc_url;
+  int pipe1[2]; /* written by host process, read by plugin UI process */
+  int pipe2[2]; /* written by plugin UI process, read by host process */
+  char ui_recv_pipe[100];
+  char ui_send_pipe[100];
+  int oldflags;
 
   //printf("instantiate('%s', '%s') called\n", plugin_uri, bundle_path);
@@ -297 +234 @@
   control_ptr->ui_closed = ui_host_ptr->ui_closed;
 
+  if (pipe(pipe1) != 0)
+  {
+    fprintf(stderr, "pipe1 creation failed.");
+  }
+
+  if (pipe(pipe2) != 0)
+  {
+    fprintf(stderr, "pipe2 creation failed.");
+  }
+
+  snprintf(ui_recv_pipe, sizeof(ui_recv_pipe), "%d", pipe1[0]); /* [0] means reading end */
+  snprintf(ui_send_pipe, sizeof(ui_send_pipe), "%d", pipe2[1]); /* [1] means writting end */
+
   filename = malloc(strlen(bundle_path) + strlen(UI_EXECUTABLE) + 1);
   if (filename == NULL)
@@ -308 +258 @@
   control_ptr->running = false;
   control_ptr->visible = false;
-  control_ptr->osc_address = NULL;
-
-  control_ptr->osc_server = lo_server_new(NULL, NULL);
-  osc_url = lo_server_get_url(control_ptr->osc_server);
-  //printf("host OSC URL is %s\n", osc_url);
-  lo_server_add_method(control_ptr->osc_server, NULL, NULL, osc_message_handler, control_ptr);
-
-  if (fork() == 0)
-  {
+
+  switch (vfork())
+  {
+  case 0:                       /* child process */
+    /* fork duplicated the handles, close pipe ends that are used by parent process */
+    /* it looks we cant do this for vfork() */
+    //close(pipe1[1]);
+    //close(pipe2[0]);
+
     execlp(
       "python",
       "python",
       filename,
-      osc_url,
       plugin_uri,
       bundle_path,
       ui_host_ptr->plugin_human_id != NULL ? ui_host_ptr->plugin_human_id : "",
+      ui_recv_pipe,             /* reading end */
+      ui_send_pipe,             /* writting end */
       NULL);
     fprintf(stderr, "exec of UI failed: %s", strerror(errno));
     exit(1);
-  }
-
-  while (!control_ptr->running)
-  {
-    if (lo_server_recv_noblock(control_ptr->osc_server, 0) == 0)
-    {
-      usleep(300000);
-    }
-  }
+  case -1:
+    fprintf(stderr, "fork() failed to create new process for plugin UI");
+    goto fail_free_control;
+  }
+
+  /* fork duplicated the handles, close pipe ends that are used by the child process */
+  close(pipe1[0]);
+  close(pipe2[1]);
+
+  control_ptr->send_pipe = pipe1[1]; /* [1] means writting end */
+  control_ptr->recv_pipe = pipe2[0]; /* [0] means reading end */
+
+  oldflags = fcntl(control_ptr->recv_pipe, F_GETFL);
+  fcntl(control_ptr->recv_pipe, F_SETFL, oldflags | O_NONBLOCK);
 
   *widget = (LV2UI_Widget)control_ptr;
@@ -369 +325 @@
   const void * buffer)
 {
+  char buf[100];
+  int len;
+  char * locale;
+
   //printf("port_event(%u, %f) called\n", (unsigned int)port_index, *(float *)buffer);
 
-  lo_send(control_ptr->osc_address, control_ptr->osc_control_path, "if", (int)port_index, *(float *)buffer);
+  locale = strdup(setlocale(LC_NUMERIC, NULL));
+  setlocale(LC_NUMERIC, "POSIX");
+
+  write(control_ptr->send_pipe, "port_value\n", 11);
+  len = sprintf(buf, "%u\n", (unsigned int)port_index);
+  write(control_ptr->send_pipe, buf, len);
+  len = sprintf(buf, "%.10f\n", *(float *)buffer);
+  write(control_ptr->send_pipe, buf, len);
+  fsync(control_ptr->send_pipe);
+
+  setlocale(LC_NUMERIC, locale);
+  free(locale);
 }
 

ui

@@ -19 +19 @@
 
 import sys
+import os
+import fcntl
 import gtk
 import gobject
@@ -24 +26 @@
 from math import pi, sin, cos, atan2, log, sqrt, hypot, log10
 from colorsys import hls_to_rgb, rgb_to_hls
-import liblo
 
 def map_coords_linear(x,y):
@@ -874 +875 @@
         self.invalidate_all()
 
-class dssi_ui:
+class filter_ui:
     def __init__(self, argv):
         self.fake = len(argv) == 1
@@ -885 +886 @@
 
         #print repr(argv)
-        self.host_osc_url = argv[1]
-        self.plugin_uri = argv[2]
-        self.bundle_path = argv[3]
-        self.human_id = argv[4]
-
-        self.server = liblo.Server()
-        self.server.add_method(None, None, self.on_osc)
-        self.send_update()
-
-    def send_update(self):
-        if self.fake:
-            return
-        #print "UI -> update -> host"
-        liblo.send(self.host_osc_url, "//update", self.server.get_url())
-
-    def send_port_value(self, port_index, value):
-        if self.fake:
-            return
-        liblo.send(self.host_osc_url, "//control", int(port_index), float(value))
-
-    def send_exiting(self):
-        if self.fake:
-            return
-        liblo.send(self.host_osc_url, "//exiting")
-
-    def run(self):
-        if self.fake:
-            if not self.shown:
-                self.shown = True
-                self.on_show()
-            return
-
-        while self.server.recv(0):
-            pass
-
-    def on_osc(self, path, args, types):
-        if path == "/control" and types == "if":
-            self.on_port_value_changed(args[0], args[1])
-        elif path == "/show" and types == "":
-            self.on_show()
-        elif path == "/hide" and types == "":
-            self.on_hide()
-        elif path == "/quit" and types == "":
-            self.on_quit()
-        else:
-            print "Unhandled OSC message. path='%s' types='%s', args=%s" % (path, types, repr(args))
-
-    def on_port_value_changed(self, port_index, port_value):
-        return
-
-    def on_show(self):
-        return
-
-    def on_hide(self):
-        return
-
-    def on_quit(self):
-        return
-
-class filter_ui(dssi_ui):
-    def __init__(self, argv):
-        dssi_ui.__init__(self, argv)
+        self.plugin_uri = argv[1]
+        self.bundle_path = argv[2]
+        self.human_id = argv[3]
+
+        self.recv_pipe_fd = int(argv[4])
+        self.send_pipe_fd = int(argv[5])
+
+        oldflags = fcntl.fcntl(self.recv_pipe_fd, fcntl.F_GETFL)
+        fcntl.fcntl(self.recv_pipe_fd, fcntl.F_SETFL, oldflags | os.O_NONBLOCK)
+
+        self.recv_pipe = os.fdopen(self.recv_pipe_fd, 'r')
+        self.send_pipe = os.fdopen(self.send_pipe_fd, 'w')
 
         if self.plugin_uri == "http://nedko.aranaudov.org/soft/filter/2/mono":
@@ -1188 +1139 @@
             self.send_port_value(port_index + self.port_base, value)
 
+    def send(self, lines):
+        for line in lines:
+            #print 'send: "' + line + '"'
+            self.send_pipe.write(line + "\n")
+            self.send_pipe.flush()
+
+    def send_exiting(self):
+        self.send(["exiting"])
+
+    def send_port_value(self, port_index, value):
+        self.send(["port_value", str(port_index), "%.10f" % value])
+
+    def recv_line(self):
+        return self.recv_pipe.readline().strip()
+
+    def recv_command(self):
+        try:
+            msg = self.recv_line()
+
+            if msg == "port_value":
+                port_index = int(self.recv_line())
+                port_value = float(self.recv_line())
+                #print "port_value_change recevied: %d %f" % (port_index, port_value)
+                self.on_port_value_changed(port_index, port_value)
+            elif msg == "show":
+                self.on_show()
+            elif msg == "hide":
+                self.on_hide()
+            elif msg == "quit":
+                self.on_quit()
+            else:
+                print 'unknown message: "' + msg + '"'
+
+            return True
+        except IOError:
+            return False
+
+    def on_recv(self, fd, cond):
+        #print "on_recv"
+        if cond == gobject.IO_HUP:
+            gtk.main_quit()
+            return False
+
+        while True:
+            if not self.recv_command():
+                break
+
+        return True
+
     def run(self):
         self.window.connect("destroy", self.on_window_closed)
-        gobject.timeout_add(50, self.on_idle)
+
+        if self.fake:
+            if not self.shown:
+                self.shown = True
+                self.on_show()
+        else:
+            gobject.io_add_watch(self.recv_pipe_fd, gobject.IO_IN | gobject.IO_HUP, self.on_recv)
+
         gtk.main()
-
-    def on_idle(self):
-        dssi_ui.run(self)
-        return True
 
     def on_port_value_changed(self, port_index, port_value):