Changeset 3934

Timestamp:

03/02/10 12:27:58 (5 months ago)

Author:

sletz

Message:

Cleanup, limit size for sync packet.

Files:

• jack2/branches/libjacknet/common/JackNetInterface.cpp (modified) (23 diffs)
• jack2/branches/libjacknet/common/JackNetInterface.h (modified) (1 diff)
• jack2/branches/libjacknet/macosx/iphone/main_slave.mm (modified) (1 diff)

jack2/branches/libjacknet/common/JackNetInterface.cpp

@@ -26 +26 @@
-
-#define PACKET_AVAILABLE_SIZE (fParams.fMtu - sizeof(packet_header_t))
+#define HEADER_SIZE (sizeof(packet_header_t))
-
-/*  
@@ -310 +311 @@
-
-        //audio netbuffer length
-sizeof ( packet_header_t )
-sizeof ( packet_header_t )
+HEADER_SIZE
+HEADER_SIZE
-    }
-
@@ -341 +342 @@
-    {
-        int rx_bytes;
-if ( ( ( rx_bytes = fSocket.Recv ( fRxBuffer, size, flags ) ) == SOCKET_ERROR ) && fRunning )
-
+
+if ((( rx_bytes = fSocket.Recv(fRxBuffer, size, flags)) == SOCKET_ERROR) && fRunning) 
-            net_error_t error = fSocket.GetError();
-            //no data isn't really a network error, so just return 0 avalaible read bytes
- error == NET_NO_DATA )
+error == NET_NO_DATA) {
-                return 0;
-
-
+
-                //fatal connection issue, exit
- ( NET_ERROR_CODE ) 
+(NET_ERROR_CODE)
-                //ask to the manager to properly remove the master
-                Exit();
@@ -356 +356 @@
-                // UGLY temporary way to be sure the thread does not call code possibly causing a deadlock in JackEngine.
-                ThreadExit();
-
-else
-    jack_error ( "Error in master receive : %s", StrError ( NET_ERROR_CODE ) );
+ else {
+    jack_error ( "Error in master receive : %s", StrError(NET_ERROR_CODE));
+}
-        }
-        
@@ -372 +372 @@
-        PacketHeaderHToN(header, header);
-        
-
-
+
-            net_error_t error = fSocket.GetError();
-
-
+
-                //fatal connection issue, exit
- "'%s' : %s, exiting.", fParams.fName, StrError ( NET_ERROR_CODE ) 
+"'%s' : %s, exiting.", fParams.fName, StrError (NET_ERROR_CODE)
-                Exit();
-                
-                // UGLY temporary way to be sure the thread does not call code possibly causing a deadlock in JackEngine.
-                ThreadExit();
-
-else
-    jack_error ( "Error in master send : %s", StrError ( NET_ERROR_CODE ) );
+ else {
+    jack_error("Error in master send : %s", StrError(NET_ERROR_CODE));
+}
-        }
-        return tx_bytes;
@@ -405 +403 @@
-        fTxHeader.fDataType = 's';
-        fTxHeader.fIsLastPckt = ( fParams.fSendMidiChannels == 0 && fParams.fSendAudioChannels == 0) ?  1 : 0;
-fParams.fMtu
- ( fTxBuffer, &fTxHeader, sizeof ( packet_header_t ) 
- ( fTxHeader.fPacketSize, 0 
+HEADER_SIZE
+(fTxBuffer, &fTxHeader, HEADER_SIZE
+(fTxHeader.fPacketSize, 0
-    }
-
@@ -423 +421 @@
-            {
-                fTxHeader.fSubCycle = subproc;
- ( subproc == ( fTxHeader.fNMidiPckt - 1 ) 
-sizeof ( packet_header_t ) + fNetMidiCaptureBuffer->RenderToNetwork ( subproc, fTxHeader.fMidiDataSize 
-sizeof ( packet_header_t ) 
- Send ( fTxHeader.fPacketSize, 0 ) == SOCKET_ERROR 
+( subproc == (fTxHeader.fNMidiPckt - 1)
+HEADER_SIZE + fNetMidiCaptureBuffer->RenderToNetwork(subproc, fTxHeader.fMidiDataSize
+HEADER_SIZE
+Send (fTxHeader.fPacketSize, 0) == SOCKET_ERROR
-                    return SOCKET_ERROR;
-            }
@@ -437 +435 @@
-            fTxHeader.fMidiDataSize = 0;
-            fTxHeader.fNMidiPckt = 0;
- subproc = 0; subproc < fNSubProcess; subproc++ 
+subproc = 0; subproc < fNSubProcess; subproc++
-            {
-                fTxHeader.fSubCycle = subproc;
- subproc == ( fNSubProcess - 1 ) 
+subproc == (fNSubProcess - 1)
-                fTxHeader.fPacketSize = fAudioTxLen;
- ( fTxBuffer, &fTxHeader, sizeof ( packet_header_t ) 
- ( subproc 
- Send ( fTxHeader.fPacketSize, 0 ) == SOCKET_ERROR 
+(fTxBuffer, &fTxHeader, HEADER_SIZE
+(subproc
+Send(fTxHeader.fPacketSize, 0) == SOCKET_ERROR
-                    return SOCKET_ERROR;
-            }
@@ -455 +453 @@
-    {
-        packet_header_t* rx_head = reinterpret_cast<packet_header_t*> ( fRxBuffer );
- ( fParams.fMtu, MSG_PEEK 
+(HEADER_SIZE, MSG_PEEK
-        
-        if ( ( rx_bytes == 0 ) || ( rx_bytes == SOCKET_ERROR ) )
@@ -486 +484 @@
-                //  - if the network is too fast, just wait the next cycle, the benefit here is the master's cycle is shorter
-                //  - indeed, data is supposed to be on the network rx buffer, so we don't have to wait for it
-1
+CYCLE_OFFSET_NORMAL
-                    return 0;
-                } else {
@@ -492 +490 @@
-                }
-                    
-!= 1
+> CYCLE_OFFSET_NORMAL
-                    jack_info("'%s' can't run in normal network mode, data received too late (%d cycle(s) offset)", fParams.fName, fCycleOffset);
-                }
@@ -504 +502 @@
-                rx_bytes = Recv ( rx_head->fPacketSize, 0 );
-                
-!= 0
+> CYCLE_OFFSET_FAST
-                    jack_info("'%s' can't run in fast network mode, data received too late (%d cycle(s) offset)", fParams.fName, fCycleOffset);
-                }
@@ -527 +525 @@
-        {
-            //how much data is queued on the rx buffer ?
- ( fParams.fMtu, MSG_PEEK 
+(HEADER_SIZE, MSG_PEEK
-              
-            if ( rx_bytes == SOCKET_ERROR )
@@ -547 +545 @@
-                        fRxHeader.fCycle = rx_head->fCycle;
-                        fRxHeader.fIsLastPckt = rx_head->fIsLastPckt;
- ( rx_head->fSubCycle, rx_bytes - sizeof ( packet_header_t ) 
+(rx_head->fSubCycle, rx_bytes - HEADER_SIZE
-                        if ( ++recvd_midi_pckt == rx_head->fNMidiPckt )
-                            fNetMidiPlaybackBuffer->RenderToJackPorts();
@@ -733 +731 @@
-            memset(&net_params, 0, sizeof ( session_params_t ));
-            rx_bytes = fSocket.CatchHost ( &net_params, sizeof ( session_params_t ), 0 );
-            
-            SessionParamsDisplay(&net_params);
-            jack_error ( "rx_bytes %d %d", rx_bytes, errno );
-            
-            
-            SessionParamsNToH(&net_params, &host_params);
-            if ( ( rx_bytes == SOCKET_ERROR ) && ( fSocket.GetError() != NET_NO_DATA ) )
@@ -744 +737 @@
-                return NET_RECV_ERROR;
-            }
-            for (int i = 0; i < 7; i++) {
-                jack_info ( " fPacketType %d", host_params.fPacketType[i]);
-            }
-            jack_info ( " received... host_params param %s %s %d %d",  net_params.fPacketType, fParams.fPacketType, net_params.fPacketID, GetPacketType ( &host_params ));
-        
-            SessionParamsDisplay(&host_params);
-        }
-        while ( strcmp ( host_params.fPacketType, fParams.fPacketType )  && ( GetPacketType ( &host_params ) != SLAVE_SETUP ) );
-
-
-
+
-        //everything is OK, copy parameters
+        SessionParamsDisplay(&host_params);
-        fParams = host_params;
-
@@ -811 +797 @@
-
-        //audio netbuffer length
-sizeof ( packet_header_t )
-sizeof ( packet_header_t )
+HEADER_SIZE
+HEADER_SIZE
-    }
-
@@ -868 +854 @@
-        do
-        {
- ( fParams.fMtu, 0 
+(HEADER_SIZE, 0
-            //connection issue, send will detect it, so don't skip the cycle (return 0)
-            if ( rx_bytes == SOCKET_ERROR )
@@ -890 +876 @@
-        while ( !fRxHeader.fIsLastPckt )
-        {
- ( fParams.fMtu, MSG_PEEK 
+(HEADER_SIZE, MSG_PEEK
-            //error here, problem with recv, just skip the cycle (return -1)
-
@@ -903 +889 @@
-                        fRxHeader.fCycle = rx_head->fCycle;
-                        fRxHeader.fIsLastPckt = rx_head->fIsLastPckt;
- ( rx_head->fSubCycle, rx_bytes - sizeof ( packet_header_t ) 
+(rx_head->fSubCycle, rx_bytes - HEADER_SIZE
-                        // Last midi packet is received, so finish rendering...
-                        if ( ++recvd_midi_pckt == rx_head->fNMidiPckt )
@@ -939 +925 @@
-    {
-        //tx header
-
+ {
-            fTxHeader.fCycle = fRxHeader.fCycle;
-else
+} else {
-            fTxHeader.fCycle++;
+        }
-        fTxHeader.fSubCycle = 0;
-        fTxHeader.fDataType = 's';
-        fTxHeader.fIsLastPckt = ( fParams.fReturnMidiChannels == 0 && fParams.fReturnAudioChannels == 0) ?  1 : 0;
-
-
-
+
+
+
+
-    }
-
@@ -964 +952 @@
-            {
-                fTxHeader.fSubCycle = subproc;
- ( subproc == ( fTxHeader.fNMidiPckt - 1 ) ) && !fParams.fReturnAudioChannels 
-sizeof ( packet_header_t ) + fNetMidiPlaybackBuffer->RenderToNetwork ( subproc, fTxHeader.fMidiDataSize 
- ( fTxBuffer, &fTxHeader, sizeof ( packet_header_t ) 
- Send ( fTxHeader.fPacketSize, 0 ) == SOCKET_ERROR 
+(subproc == (fTxHeader.fNMidiPckt - 1)) && !fParams.fReturnAudioChannels
+HEADER_SIZE+ fNetMidiPlaybackBuffer->RenderToNetwork(subproc, fTxHeader.fMidiDataSize
+(fTxBuffer, &fTxHeader, HEADER_SIZE
+Send(fTxHeader.fPacketSize, 0) == SOCKET_ERROR
-                    return SOCKET_ERROR;
-            }
@@ -981 +969 @@
-            {
-                fTxHeader.fSubCycle = subproc;
- subproc == ( fNSubProcess - 1 ) 
+subproc == (fNSubProcess - 1)
-                fTxHeader.fPacketSize = fAudioTxLen;
- ( fTxBuffer, &fTxHeader, sizeof ( packet_header_t ) 
- subproc 
- Send ( fTxHeader.fPacketSize, 0 ) == SOCKET_ERROR 
+(fTxBuffer, &fTxHeader, HEADER_SIZE
+subproc
+Send(fTxHeader.fPacketSize, 0) == SOCKET_ERROR
-                    return SOCKET_ERROR;
-            }

jack2/branches/libjacknet/common/JackNetInterface.h

@@ -213 +213 @@
-#define SLAVE_INIT_TIMEOUT 2000000      // in usec
-
-
+
+
+
-#define MAX_LATENCY CYCLE_OFFSET_SLOW * 4
-

jack2/branches/libjacknet/macosx/iphone/main_slave.mm

@@ -63 +63 @@
-    jack_master_t result;
-
-
+
+
-        return -1;
-    }
+    
-    
-    if ((adapter = jack_create_adapter(NUM_INPUT,