Changeset 574

Timestamp:

08/27/07 08:41:50 (16 years ago)

Author:

ppalmers

Message:

- scons can now auto-generate the DBUS interface adaptor/proxy classes
- implemented a very basic DBUS client/server pair:

test-dbus and test-dbus-server

- some small missing key fixes in the scons files

Files:

• trunk/libffado/external/dbus/SConscript (modified) (4 diffs)
• trunk/libffado/SConstruct (modified) (4 diffs)
• trunk/libffado/src/libcontrol (added)
• trunk/libffado/support/mixer/SConscript (modified) (1 diff)
• trunk/libffado/tests/controlclient.cpp (added)
• trunk/libffado/tests/controlclient.h (added)
• trunk/libffado/tests/controlserver.cpp (added)
• trunk/libffado/tests/controlserver.h (added)
• trunk/libffado/tests/SConscript (modified) (2 diffs)
• trunk/libffado/tests/test-dbus-server.cpp (added)
• trunk/libffado/tests/test-dbus.cpp (modified) (6 diffs)

trunk/libffado/external/dbus/SConscript

@@ -21 +21 @@
-dbus_env = Environment( ENV = buildenv )
-
-
+#
-
-
+
+
-
-# add the local version of libdbus++
@@ -30 +31 @@
-dbus_env.AppendUnique( LIBS=["dbus-c++"] )
-dbus_env.AppendUnique( CCFLAGS=["-DDBUS_API_SUBJECT_TO_CHANGE"] )
+
+# this is required to indicate that the DBUS version we use has support
+# for platform dependent threading init functions
+# this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is
+# always true
+dbus_env.AppendUnique( CCFLAGS=["-DDBUS_HAS_THREADS_INIT_DEFAULT"] )
-
-sources = [
@@ -47 +54 @@
-]
-
-
+.has_key('DEBUG') and env
-        dbus_env.AppendUnique( CCFLAGS=["-DDEBUG","-g"] )
-
@@ -80 +87 @@
-
-def dbusxx_xml2cpp_emitter(target, source, env):
-       
-       
+    
+    
-
-
-       
-       
+adaptor_
+    
+    
-
-
+
+
+
+
+
+

trunk/libffado/SConstruct

@@ -139 +139 @@
-        env.AppendUnique( CCFLAGS=["-O2"] )
-
+# this is required to indicate that the DBUS version we use has support
+# for platform dependent threading init functions
+# this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is
+# always true
+env.AppendUnique( CCFLAGS=["-DDBUS_HAS_THREADS_INIT_DEFAULT"] )
+
-if env['ENABLE_ALL']:
-        env['ENABLE_BEBOB'] = True
@@ -170 +176 @@
-# The relevant MergeFlags-calls should be moved to the SConscript-files where
-# its needed...
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-#
@@ -204 +216 @@
-env.Alias( "install", env.Install( env['libdir'] + '/pkgconfig', pkgconfig ) )
-
-
-src','libffado','tests','support','
+
+
-if build_base:
-        env['build_base']="#/"+build_base
@@ -214 +226 @@
-        env.SConscript( dirs=subdirs, exports="env" )
-
+if not env.GetOption('clean'):
+    Default( 'external' )
+    
+Import( 'dbusxx_xml2cpp_adaptor_builder' )
+env.Append(BUILDERS = {'XML2CPP_ADAPTOR' : dbusxx_xml2cpp_adaptor_builder})
+
+Import( 'dbusxx_xml2cpp_proxy_builder' )
+env.Append(BUILDERS = {'XML2CPP_PROXY' : dbusxx_xml2cpp_proxy_builder})
+
+# now build our own stuff, which can use the tools defined above
+subdirs=['src','libffado','tests','support']
+if build_base:
+        env['build_base']="#/"+build_base
+        for subdir in subdirs:
+                env.SConscript( dirs=subdir, exports="env", build_dir=build_base+subdir )
+else:
+        env['build_base']="#/"
+        env.SConscript( dirs=subdirs, exports="env" )
+
-
-# By default only src is built but all is cleaned
-if not env.GetOption('clean'):
-
-
-
-
-
-
+
+
+
+
+

trunk/libffado/support/mixer/SConscript

@@ -3 +3 @@
-Import( 'env' )
-
-
+.has_key('HAVE_PYUIC') and env
-
-        env = env.Copy()

trunk/libffado/tests/SConscript

@@ -5 +5 @@
-env = env.Copy()
-
-
-
-
+
+
+
+
+
-
-#
@@ -13 +15 @@
-#
-#for app in ["test-ffado", "test-extplugcmd", "test-fw410", "test-volume", "test-mixer", "test-cycletimer", "test-timestampedbuffer", "test-ieee1394service", "test-streamdump"]:
-, "test-dbus"
-       
+
+    
-
-env.Program( target="test-sytmonitor", source = env.Split( "test-sytmonitor.cpp SytMonitor.cpp" ) )
-
+env.XML2CPP_PROXY('controlclient-glue.h', 'controlstuff.xml')
+env.Program( target="test-dbus", source = env.Split( "test-dbus.cpp controlclient.cpp" ) )
+
+env.XML2CPP_ADAPTOR('controlserver-glue.h', 'controlstuff.xml')
+env.Program( target="test-dbus-server", source = env.Split( "test-dbus-server.cpp controlserver.cpp" ) )
+
-env.SConscript( dirs="streaming", exports="env" )
-

trunk/libffado/tests/test-dbus.cpp

@@ -1 +1 @@
-/*
- * Copyright (C) 2007 by Pieter Palmers
- * Copyright (C) 2005-2007 by Daniel Wagner
- *
- * This file is part of FFADO
@@ -24 +23 @@
- */
-
-#include <libraw1394/raw1394.h>
-#include <libiec61883/iec61883.h>
-#include <libavc1394/avc1394.h>
-
-#include <argp.h>
-#include <stdlib.h>
-#include <iostream>
+#include <signal.h>
+
+#include "controlclient.h"
+#include <dbus-c++/dbus.h>
-
-using namespace std;
+
+DECLARE_GLOBAL_DEBUG_MODULE;
-
-////////////////////////////////////////////////
-// arg parsing
-////////////////////////////////////////////////
-echo
+dbus
-const char *argp_program_bug_address = "<ffado-devel@lists.sf.net>";
-echo -- test program for the ECHO AUDIOFIRE devices
-NODE_ID
+dbus -- test client for the DBUS interface
+
-static struct argp_option options[] = {
-    {"verbose",   'v', 0,           0,  "Produce verbose output" },
-    {"port",      'p', "PORT",      0,  "Set port" },
-   { 0 }
-};
@@ -51 +51 @@
-    arguments()
-        : verbose( false )
-        , test( false )
-        , port( 0 )
-        {
-            args[0] = 0;
-        }
-
-1
+50
-    bool  verbose;
-    bool  test;
-    int   port;
-} arguments;
-
@@ -71 +67 @@
-    struct arguments* arguments = ( struct arguments* ) state->input;
-
-
+// 
-    switch (key) {
-    case 'v':
-        arguments->verbose = true;
-        break;
-    case 't':
-        arguments->test = true;
-        break;
-    case 'p':
-        errno = 0;
-        arguments->port = strtol(arg, &tail, 0);
-        if (errno) {
-            perror("argument parsing failed:");
-            return errno;
-        }
-        break;
-    case ARGP_KEY_ARG:
-1
+50
-            // Too many arguments.
-            argp_usage (state);
@@ -95 +80 @@
-        break;
-    case ARGP_KEY_END:
-        if (state->arg_num < 1) {
-            // Not enough arguments.
-            argp_usage (state);
-        }
-        break;
-    default:
@@ -111 +92 @@
-// main
-//////////////////////////
+
+DBus::BusDispatcher dispatcher;
+static const int THREADS = 1;
+static bool spin = true;
+
+void leave( int sig )
+{
+    spin = false;
+    dispatcher.leave();
+}
+
+void* worker_thread( void* )
+{
+    DBus::Connection conn = DBus::Connection::SessionBus();
+
+    Control::ControlClient client(conn, SERVER_PATH, SERVER_NAME);
+
+    int i=0;
+    while(spin)
+    {
+        try {
+            client.Echo(i++);
+        } catch(...) {
+            cout << "error on Echo()\n";
+        };
+//         try {
+//             std::map< DBus::String, DBus::String > info = client.Info();
+//             cout << info["testset1"] << " - " << info["testset2"] << std::endl;
+//         } catch(...) {
+//             cout << "error on Info()\n";
+//         };
+
+        cout << "* " << i << "*\n";
+        sleep(1);
+    }
+
+    return NULL;
+}
+
+void run_client_tests() {
+    DBus::default_dispatcher = &dispatcher;
+
+    pthread_t thread;
+
+    pthread_create(&thread, NULL, worker_thread, NULL);
+
+    dispatcher.enter();
+
+    pthread_join(thread, NULL);
+}
+
-int
-main(int argc, char **argv)
-{
+    signal(SIGTERM, leave);
+    signal(SIGINT, leave);
+    
+    setDebugLevel(DEBUG_LEVEL_VERBOSE);
+    
-    // arg parsing
-    argp_parse (&argp, argc, argv, 0, 0, &arguments);
-
-    errno = 0;
-
-int iNodeId = strtol(arguments.args[0], &tail, 0);
+// 
+
-    if (errno) {
-
-
+    
+    
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    
-//     cerr << "Opening descriptor" << endl;
-//     0h 05m 21.760442s - GetDescriptorOpen:  cmd[0]= < 0x00 0x60 0x08 0x80 0x01 0xFF>
-//     0h 05m 21.760687s - GetDescriptorOpen: resp[0]= < 0x09 0x60 0x08 0x80 0x01 0xFF > ACCEPTED
-
-
-//     cmd[0] = 0x00600880;
-//     cmd[1] = 0x01FF0000;
-//     avc1394_transaction_block2(pHandle, 0xffc0 | iNodeId, cmd, 2, &response_len, 10);
-//     usleep(100000); 
-//     
-//     cerr << "Reading descriptor" << endl;
-// //     0h 05m 21.760700s - GetDescriptorRead:  cmd[0]= < 0x00 0x60 0x09 0x80 0xFF 0xFF 0x00 0x00 0x00 0x00>
-// //     0h 05m 21.761123s - GetDescriptorRead: resp[0]= < 0x09 0x60 0x09 0x80 0x11 0xFF 0x01 0xF6 0x00 0x00 0x03 0x9E 
-//     cmd[0] = 0x00600980;
-//     cmd[1] = 0xFFFF0000;
-//     cmd[2] = 0x00000000;
-//     cmd[2] = 0x00000000;
-//      
-//     avc1394_transaction_block2(pHandle, 0xffc0 | iNodeId, cmd, 3, &response_len, 10);
-//     usleep(100000);
-//     
-//     cerr << "Closing descriptor" << endl;
-//     cmd[0] = 0x00600880;
-//     cmd[1] = 0x00FF0000;
-//     avc1394_transaction_block2(pHandle, 0xffc0 | iNodeId, cmd, 2, &response_len, 10);
-//     usleep(100000);
-
-    cerr << "getting signal source" << endl;
-//     0h 05m 21.762917s - at line 2283, fMaxAudioOutputChannels=2, fMaxAudioInputChannels=0
-//     0h 05m 21.762919s - GetSignalSource:  cmd[0]= < 0x01 0xFF 0x1A 0xFF 0xFF 0xFE 0xFF 0x00>
-//     0h 05m 21.763149s - GetSignalSource: resp[0]= < 0x0c 0xFF 0x1A 0x60 0x60 0x00 0xFF 0x00 > IMPLEMENTED
-//     0h 05m 21.763167s - Isoch out 0 gets its signal from sub/unit 0x60 Source Plug 0
-//     0h 05m 21.763170s - GetSignalSource:  cmd[0]= < 0x01 0xFF 0x1A 0xFF 0xFF 0xFE 0xFF 0x80>
-//     0h 05m 21.763376s - GetSignalSource: resp[0]= < 0x0c 0xFF 0x1A 0x00 0x60 0x01 0xFF 0x80 > IMPLEMENTED
-//     0h 05m 21.763394s - Isoch out 128 gets its signal from sub/unit 0x60 Source Plug 1
-//     0h 05m 21.763397s - GetSignalSource:  cmd[0]= < 0x01 0xFF 0x1A 0xFF 0xFF 0xFE 0xFF 0x81>
-//     0h 05m 21.763637s - GetSignalSource: resp[0]= < 0x0c 0xFF 0x1A 0x00 0x60 0x02 0xFF 0x81 > IMPLEMENTED
-//     0h 05m 21.763654s - Isoch out 129 gets its signal from sub/unit 0x60 Source Plug 2
-
-//     0h 05m 21.764895s - Starting to look at subunit 1.  fNumberOfSubUnits = 2
-//     0h 05m 21.764897s - Subunit 1 GetSignalSource:  cmd[0]= < 0x01 0xFF 0x1A 0xFF 0xFF 0xFE 0x60 0x00>
-//     0h 05m 21.765129s - GetSignalSource: resp[0]= < 0x0c 0xFF 0x1A 0x20 0xFF 0x00 0x60 0x00 > IMPLEMENTED
-//     0h 05m 21.765140s - Subunit type12, addr:0x60 dest 0 gets its signal from sub/unit 0xff Source Plug 0
-//     0h 05m 21.765142s - subunit 96 dest plug 0 is routed
-//     0h 05m 21.765143s - Subunit 1 GetSignalSource:  cmd[0]= < 0x01 0xFF 0x1A 0xFF 0xFF 0xFE 0x60 0x01>
-//     0h 05m 21.765364s - GetSignalSource: resp[0]= < 0x0c 0xFF 0x1A 0x00 0xFF 0x80 0x60 0x01 > IMPLEMENTED
-//     0h 05m 21.765382s - Subunit type12, addr:0x60 dest 1 gets its signal from sub/unit 0xff Source Plug 128
-//     0h 05m 21.765385s -      Plug being changed from 0x80 to 1 for internal bookeeping.
-//     0h 05m 21.765389s - Subunit 1 GetSignalSource:  cmd[0]= < 0x01 0xFF 0x1A 0xFF 0xFF 0xFE 0x60 0x02>
-//     0h 05m 21.765632s - GetSignalSource: resp[0]= < 0x0c 0xFF 0x1A 0x00 0xFF 0x81 0x60 0x02 > IMPLEMENTED
-//     0h 05m 21.765651s - Subunit type12, addr:0x60 dest 2 gets its signal from sub/unit 0xff Source Plug 129
-//     0h 05m 21.765653s -      Plug being changed from 0x81 to 2 for internal bookeeping.
-//     0h 05m 21.765657s - Subunit 1 GetSignalSource:  cmd[0]= < 0x01 0xFF 0x1A 0xFF 0xFF 0xFE 0x60 0x03>
-//     0h 05m 21.765874s - GetSignalSource: resp[0]= < 0x0c 0xFF 0x1A 0x00 0x60 0x03 0x60 0x03 > IMPLEMENTED
-//     0h 05m 21.765892s - Subunit type12, addr:0x60 dest 3 gets its signal from sub/unit 0x60 Source Plug 3
-
-    cmd[0] = 0x01FF1AFF;
-    cmd[1] = 0xFFFE6000;
-    avc1394_transaction_block2(pHandle, 0xffc0 | iNodeId, cmd, 2, &response_len, 10);
-//     usleep(100000);
-    
-    cmd[0] = 0x01FF1AFF;
-    cmd[1] = 0xFFFEFF00;
-    avc1394_transaction_block2(pHandle, 0xffc0 | iNodeId, cmd, 2, &response_len, 10);
-    usleep(100000);
-
-
-
-    raw1394_destroy_handle( pHandle );
-    return 0;
-}