Changeset 3587

Timestamp:

07/09/09 03:05:42 (1 year ago)

Author:

sletz

Message:

Use attribute((packed)) again, more fixes for 64/32 mixed mode. Torben Hohn changes for 64/32 mixed mode in wscripts.

Files:

• jack2/trunk/jackmp/ChangeLog (modified) (1 diff)
• jack2/trunk/jackmp/common/jack/jack.h (modified) (1 diff)
• jack2/trunk/jackmp/common/jack/midiport.h (modified) (1 diff)
• jack2/trunk/jackmp/common/JackActivationCount.h (modified) (1 diff)
• jack2/trunk/jackmp/common/JackConnectionManager.h (modified) (6 diffs)
• jack2/trunk/jackmp/common/JackConstants.h (modified) (1 diff)
• jack2/trunk/jackmp/common/JackFilters.h (modified) (4 diffs)
• jack2/trunk/jackmp/common/wscript (modified) (1 diff)
• jack2/trunk/jackmp/README (modified) (1 diff)
• jack2/trunk/jackmp/wscript (modified) (2 diffs)

jack2/trunk/jackmp/ChangeLog

@@ -26 +26 @@
----------------------------
-
+2009-07-09 Stephane Letz  <letz@grame.fr>
+
+        * Use __attribute__((__packed__)) again, more fixes for 64/32 mixed mode.
+        * Torben Hohn changes for 64/32 mixed mode in wscripts.
+
-2009-07-07 Stephane Letz  <letz@grame.fr>
-

jack2/trunk/jackmp/common/jack/jack.h

@@ -237 +237 @@
-/**
- * Tell the Jack server to call @a thread_callback in the RT thread.
-
+a
- * The code in the supplied function must be suitable for real-time
- * execution.  That means that it cannot call functions that might

jack2/trunk/jackmp/common/jack/midiport.h

@@ -48 +48 @@
- */
-
-
+*
- *
- * @param port_buffer Port buffer from which to retrieve event.

jack2/trunk/jackmp/common/JackActivationCount.h

@@ -74 +74 @@
-        }
-
-
+  POST_PACKED_STRUCTURE
-
-} // end of namespace

jack2/trunk/jackmp/common/JackConnectionManager.h

@@ -117 +117 @@
-        }
-
-
+ POST_PACKED_STRUCTURE
-
-/*!
@@ -152 +152 @@
-            }
-        }
-
+
+
-
-/*!
@@ -227 +228 @@
-        }
-
-
+ POST_PACKED_STRUCTURE
-
-/*!
@@ -340 +341 @@
-        }
-
-
+ POST_PACKED_STRUCTURE
-
-/*!
@@ -357 +358 @@
-    ~JackClientTiming()
-    {}
+    
-} POST_PACKED_STRUCTURE;
-
@@ -451 +453 @@
-        int SuspendRefNum(JackClientControl* control, JackSynchro* table, JackClientTiming* timing, long time_out_usec);
-        
-
+ POST_PACKED_STRUCTURE
-
-} // end of namespace

jack2/trunk/jackmp/common/JackConstants.h

@@ -39 +39 @@
-
-#define DRIVER_PORT_NUM 256
-256
+512
-#define FIRST_AVAILABLE_PORT 1
-

jack2/trunk/jackmp/common/JackFilters.h

@@ -55 +55 @@
-            return mean / MAX_SIZE;
-        }
-
+
+
-    
-    class JackDelayLockedLoop
@@ -137 +138 @@
-            }
-  
-
+ POST_PACKED_STRUCTURE
-    
-    class JackAtomicDelayLockedLoop : public JackAtomicState<JackDelayLockedLoop>
@@ -202 +203 @@
-                return res;
-            }
-
+ POST_PACKED_STRUCTURE
-    
-    /*
@@ -302 +303 @@
-        */
-
-        
-        double GetRatio(int error)
-        {

jack2/trunk/jackmp/common/wscript

@@ -227 +227 @@
-        clientlib.env.append_value("LINKFLAGS", "-lnsl -lsocket")
-
+    if bld.env['BUILD_WITH_32_64']:
+        print "create 32bit lib..."
+        clientlib32bit = clientlib.clone('lib32')
+
-    create_jack_process_obj(bld, 'netmanager', 'JackNetManager.cpp', serverlib)
-

jack2/trunk/jackmp/README

@@ -214 +214 @@
-1.9.1 : Fix jackctl_server_unload_internal. Filter SIGPIPE to avoid having client get a SIGPIPE when trying to access a died server. Libjack shutdown handler does not "deactivate" (fActive = false) the client anymore, so that jack_deactivate correctly does the job later on. Better isolation of server and clients system resources to allow starting the server in several user account at the same time. Report ringbuffer.c fixes from jack1. Client and library global context cleanup in case of incorrect shutdown handling (that is applications not correctly closing client after server has shutdown). Use JACK_DRIVER_DIR variable in internal clients loader. For ALSA driver, synchronize with latest jack1 memops functions. Synchronize jack2 public headers with jack1 ones. Implement jack_client_real_time_priority and jack_client_max_real_time_priority API. Use up to BUFFER_SIZE_MAX frames in midi ports, fix for ticket #117. Cleanup server starting code for clients directly linked with libjackserver.so. JackMessageBuffer was using thread "Stop" scheme in destructor, now use the safer thread "Kill" way. Synchronize ALSA backend code with JACK1 one. Set default mode to 'slow' in JackNetDriver and JackNetAdapter. Simplify audio packet order verification. Fix JackNetInterface::SetNetBufferSize for socket buffer size computation and JackNetMasterInterface::DataRecv if synch packet is received, various cleanup. Better recovery of network overload situations, now "resynchronize" by skipping cycles.". Support for BIG_ENDIAN machines in NetJack2. Support for BIG_ENDIAN machines in NetJack2 for MIDI ports. Support for "-h" option in internal clients to print the parameters. In NetJack2, fix a bug when capture or playback only channels are used. Add a JACK_INTERNAL_DIR environment variable to be used for internal clients. Add a resample quality parameter in audioadapter. Now correctly return an error if JackServer::SetBufferSize could not change the buffer size (and was just restoring the current one). Use PRIu32 kind of macro in JackAlsaDriver again. Add a resample quality parameter in netadapter.
-1.9.2 : Solaris version. New "profiling" tools. Rework the mutex/signal classes. Support for BIG_ENDIAN machines in NetJack2. D-BUS based device reservation to better coexist with PulseAudio on Linux. Add auto_connect parameter in netmanager and netadapter. Use Torben Hohn PI controler code for adapters. Client incorrect re-naming fixed : now done at socket and fifo level. Virtualize and allow overriding of thread creation function, to allow Wine support (from JACK1).
+1.9.3 : New JackBoomerDriver class for Boomer driver on Solaris. Add mixed 32/64 bits mode (off by default). Native MIDI backend (JackCoreMidiDriver, JackWinMMEDriver). In ALSA audio card reservation code, tries to open the card even if reservation fails. Clock source setting on Linux. Add jackctl_server_switch_master API. Fix transport callback (timebase master, sync) issue when used after jack_activate (RT thread was not running). D-Bus access for jackctl_server_add_slave/jackctl_server_remove_slave API. Cleanup "loopback" stuff in server. Torben Hohn fix for InitTime and GetMicroSeconds in JackWinTime.c. New jack_free function added in jack.h. Reworked Torben Hohn fix for server restart issue on Windows. Correct jack_set_error_function, jack_set_info_function and jack_set_thread_creator functions. Correct JackFifo::TimedWait for EINTR handling. Move DBus based audio device reservation code in ALSA backend compilation. Correct JackTransportEngine::MakeAllLocating, sync callback has to be called in this case also. NetJack2 code : better error checkout, method renaming. Tim Bechmann patch : hammerfall, only release monitor thread, if it has been created. Tim Bechmann memops.c optimization patches. 
-
-This is a work in progress but the implementation is now stable enough to be tested. jackdmp has been used successfully with the following applications : Ardour, Hydrogen, Jamin, Qjackctl, Jack-Rack, SooperLooper, AlsaPlayer...  

jack2/trunk/jackmp/wscript

@@ -62 +62 @@
-
-    opt.add_option('--libdir', type='string', help="Library directory [Default: <prefix>/lib]")
+    opt.add_option('--libdir32', type='string', help="32bit Library directory [Default: <prefix>/lib32]")
-    opt.add_option('--dbus', action='store_true', default=False, help='Enable D-Bus JACK (jackdbus)')
-    opt.add_option('--classic', action='store_true', default=False, help='Force enable standard JACK (jackd) even if D-Bus JACK (jackdbus) is enabled too')
@@ -207 +208 @@
-    print
-
+    if Options.options.mixed == True:
+        env_variant2 = conf.env.copy()
+        conf.set_env_name('lib32', env_variant2)
+        env_variant2.set_variant('lib32')
+        conf.setenv('lib32')
+        conf.env.append_unique('CXXFLAGS', '-m32')
+        conf.env.append_unique('CCFLAGS', '-m32')
+        conf.env.append_unique('LINKFLAGS', '-m32')
+        conf.write_config_header('config.h')
+        if Options.options.libdir32:
+            conf.env['LIBDIR'] = Options.options.libdir32
+        else:
+            conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib32/'
+
-def build(bld):
+    print ("make[1]: Entering directory `" + os.getcwd() + "/" + blddir + "'" )
-    if not os.access('svnversion.h', os.R_OK):
-        create_svnversion_task(bld)