Changeset 427

Timestamp:

06/17/03 16:09:10 (7 years ago)

Author:

trutkin

Message:

Removed #ifdef (linux) 's

Files:

• trunk/jack/jackd/engine.c (modified) (12 diffs)
• trunk/jack/libjack/client.c (modified) (5 diffs)
• trunk/jack/libjack/shm.c (modified) (1 diff)

trunk/jack/jackd/engine.c

@@ -23 +23 @@
-#include <sys/socket.h>
-
-
-
-
+
-    #include "fakepoll.h"
-    #include "ipc.h"
+#else
+    #include <sys/poll.h>
-#endif
-
@@ -300 +300 @@
-        size = nports * one_buffer;
-    
-
-
-
+
-        /* using O_TRUNC option does not work on Darwin */
-        perm = O_RDWR|O_CREAT;
+#else
+        perm = O_RDWR|O_CREAT|O_TRUNC;
-#endif
-
@@ -442 +442 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-static JSList * 
-jack_process_external(jack_engine_t *engine, JSList *node)
@@ -578 +463 @@
-        return jack_slist_next (node);
-}
+#else
+static JSList * 
+jack_process_external(jack_engine_t *engine, JSList *node)
+{
+        int status;
+        char c;
+        float delayed_usecs;
+        jack_client_internal_t *client;
+        jack_client_control_t *ctl;
+        jack_time_t now, then;
+        
+        client = (jack_client_internal_t *) node->data;
+        
+        ctl = client->control;
+
+        /* external subgraph */
+
+        ctl->state = Triggered; // a race exists if we do this after the write(2) 
+        ctl->signalled_at = jack_get_microseconds();
+        ctl->awake_at = 0;
+        ctl->finished_at = 0;
+
+        engine->current_client = client;
+
+        DEBUG ("calling process() on an external subgraph, fd==%d", client->subgraph_start_fd);
+
+        if (write (client->subgraph_start_fd, &c, sizeof (c)) != sizeof (c)) {
+                jack_error ("cannot initiate graph processing (%s)", strerror (errno));
+                engine->process_errors++;
+                return NULL; /* will stop the loop */
+        } 
+
+        then = jack_get_microseconds ();
+
+        if (engine->asio_mode) {
+                engine->driver->wait (engine->driver, client->subgraph_wait_fd, &status, &delayed_usecs);
+        } else {
+                struct pollfd pfd[1];
+                int poll_timeout = (engine->control->real_time == 0 ? engine->client_timeout_msecs : engine->driver->period_usecs/1000);
+
+                pfd[0].fd = client->subgraph_wait_fd;
+                pfd[0].events = POLLERR|POLLIN|POLLHUP|POLLNVAL;
+
+                DEBUG ("waiting on fd==%d for process() subgraph to finish", client->subgraph_wait_fd);
+
+                if (poll (pfd, 1, poll_timeout) < 0) {
+                        jack_error ("poll on subgraph processing failed (%s)", strerror (errno));
+                        status = -1; 
+                }
+
+                if (pfd[0].revents & ~POLLIN) {
+                        jack_error ("subgraph starting at %s lost client", client->control->name);
+                        status = -2; 
+                }
+
+                if (pfd[0].revents & POLLIN) {
+                        status = 0;
+                } else {
+                        jack_error ("subgraph starting at %s timed out (subgraph_wait_fd=%d, status = %d, state = %s)", 
+                                    client->control->name, client->subgraph_wait_fd, status, 
+                                    client_state_names[client->control->state]);
+                        status = 1;
+                }
+        }
+
+        now = jack_get_microseconds ();
+
+        if (status != 0) {
+                if (engine->verbose) {
+                        fprintf (stderr, "at %Lu client waiting on %d took %Lu usecs, status = %d sig = %Lu "
+                                 "awa = %Lu fin = %Lu dur=%Lu\n",
+                                 now,
+                                 client->subgraph_wait_fd,
+                                 now - then,
+                                 status,
+                                 ctl->signalled_at,
+                                 ctl->awake_at,
+                                 ctl->finished_at,
+                                 ctl->finished_at ? ctl->finished_at - ctl->signalled_at : 0);
+                }
+
+                /* we can only consider the timeout a client error if it actually woke up.
+                   its possible that the kernel scheduler screwed us up and 
+                   never woke up the client in time. sigh.
+                */
+
+                if (ctl->awake_at > 0) {
+                        ctl->timed_out++;
+                }
+
+                engine->process_errors++;
+                return NULL; /* will stop the loop */
+        } else {
+                DEBUG ("reading byte from subgraph_wait_fd==%d", client->subgraph_wait_fd);
+
+                if (read (client->subgraph_wait_fd, &c, sizeof(c)) != sizeof (c)) {
+                        jack_error ("pp: cannot clean up byte from graph wait fd (%s)", strerror (errno));
+                        client->error++;
+                        return NULL; /* will stop the loop */
+                }
+        }
+
+        /* Move to next internal client (or end of client list) */
+
+        while (node) {
+                if (jack_client_is_internal (((jack_client_internal_t *) node->data))) {
+                        break;
+                }
+                node = jack_slist_next (node);
+        }
+        
+        return node;
+}
+
-#endif
-
@@ -1753 +1752 @@
-        }
-        
-
-
-
+
-        /* using O_TRUNC option does not work on Darwin */
-        perm = O_RDWR|O_CREAT;
+#else
+        perm = O_RDWR|O_CREAT|O_TRUNC;
-#endif
-
@@ -1889 +1888 @@
-        }
-        
-
+
+
+
-        if (mlockall (MCL_CURRENT | MCL_FUTURE) != 0) {
-            jack_error ("cannot lock down memory for RT thread (%s)", strerror (errno));
-            return -1;
-        }
-#elif defined(__APPLE__) && defined(__POWERPC__) 
-        // To be implemented
-#endif
-        return 0;
@@ -2150 +2149 @@
-        }
-        
-
+
+
+
-        return pthread_create (&engine->main_thread, 0, jack_main_thread, engine);
-#elif defined(__APPLE__) && defined(__POWERPC__) 
-        return 0;
-#endif
-
@@ -2159 +2158 @@
-
-
-
+
+
+
+
+
+
+
-int
-jack_wait (jack_engine_t *engine)
@@ -2183 +2188 @@
-        return (int) ((intptr_t)ret);
-}
-
-#elif defined(__APPLE__) && defined(__POWERPC__) 
-
-int
-jack_wait (jack_engine_t *engine)
-{
-        while(1) sleep(1);
-}
-
-#endif
-
@@ -2199 +2195 @@
-        if (engine) {
-
-
-
-
+
-            /* the jack_run_cycle function is directly called from the CoreAudo audio callback */
-            return 0;
+    #else
+            return pthread_cancel (engine->main_thread);
-    #endif
-        }
@@ -2226 +2222 @@
-        case ClientExternal:
-                
-
-
-
+
-                /* using O_TRUNC option does not work on Darwin */
-                perm = O_RDWR|O_CREAT;
+        #else
+                perm = O_RDWR|O_CREAT|O_TRUNC;
-        #endif
-                snprintf (shm_name, sizeof (shm_name), "/jack-c-%s", req->name);
@@ -3230 +3226 @@
-                if (errno == ENOENT) {
-       
-
+
+
+
-                        if (mknod (path, 0666|S_IFIFO, 0) < 0) {
-                #elif defined(__APPLE__) && defined(__POWERPC__) 
-                        if (mkfifo(path,0666) < 0){
-                #endif
-                                jack_error ("cannot create inter-client FIFO [%s] (%s)\n", path, strerror (errno));

trunk/jack/libjack/client.c

@@ -19 +19 @@
-*/
-
-
-
-
+
-    #include "pThreadUtilities.h"
-    #include "ipc.h"
-    #include "fakepoll.h"
+#else
+    #include <sys/poll.h>
-#endif
-
@@ -985 +985 @@
-                }
-                
-
+
+
+
-                if (mlockall (MCL_CURRENT | MCL_FUTURE) != 0) {
-                    jack_error ("cannot lock down memory for RT thread (%s)", strerror (errno));
-                    return -1;
-                }
-        #elif defined(__APPLE__) && defined(__POWERPC__) 
-                // To be implemented
-        #endif
-        
@@ -1123 +1123 @@
-         */
-         
-
+
+
+
-       #define BIG_ENOUGH_STACK 1048576
-#elif defined(__APPLE__) && defined(__POWERPC__) 
-       #define BIG_ENOUGH_STACK 10000 // a bigger stack make the application crash...
-#endif
-
@@ -1598 +1598 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-jack_time_t
@@ -1643 +1653 @@
-}
-
-#elif defined(__APPLE__) && defined(__POWERPC__) 
-
-double __jack_time_ratio;
-
-void jack_init_time ()
-{
-        mach_timebase_info_data_t info; 
-        mach_timebase_info(&info);
-        __jack_time_ratio = ((float)info.numer/info.denom) / 1000;
-}
-
-#endif

trunk/jack/libjack/shm.c

@@ -84 +84 @@
-        */
-        
-
-
-
+
-        /* using O_TRUNC option does not work on Darwin */
-        perm = O_RDWR|O_CREAT;
+#else
+        perm = O_RDWR|O_CREAT|O_TRUNC;
-#endif
-