Changeset 194

Timestamp:

05/12/06 09:19:08 (17 years ago)

Author:

pieterpalmers

Message:

- code cleanup in the streaming part.
- calculate ISO connection parameters instead of user-supplying them
- SSE code improvement

Files:

• trunk/libfreebob/ChangeLog (modified) (1 diff)
• trunk/libfreebob/configure.ac (modified) (1 diff)
• trunk/libfreebob/libfreebob/freebob_streaming.h (modified) (2 diffs)
• trunk/libfreebob/src/libfreebobstreaming/freebob_connections.c (modified) (2 diffs)
• trunk/libfreebob/src/libfreebobstreaming/freebob_connections.h (modified) (3 diffs)
• trunk/libfreebob/src/libfreebobstreaming/freebob_streaming.c (modified) (48 diffs)
• trunk/libfreebob/tests/streaming/testmidistreaming1.c (modified) (1 diff)
• trunk/libfreebob/tests/streaming/teststreaming.c (modified) (1 diff)
• trunk/libfreebob/tests/streaming/teststreaming2.c (modified) (1 diff)
• trunk/libfreebob/tests/streaming/teststreaming3.c (modified) (1 diff)

trunk/libfreebob/ChangeLog

@@ +1 @@
+2006-05-12  Pieter Palmers  <pieterpalmers@users.sourceforge.net>
+        * src/libfreebobstreaming/*: 
+        - Code cleanup
+        - Improved SSE code
+        - ISO connection parameters are calculated instead of being user
+          specified. Note: you need a new jackd backend version due to this.
+        
+        * configure.ac: Version bumped to 0.8.2
+
-2006-05-06  Daniel Wagner  <wagi@monom.org>
-

trunk/libfreebob/configure.ac

@@ -24 +24 @@
-m4_define(freebob_major_version, 0)
-m4_define(freebob_minor_version, 8)
-1
+2
-
-m4_define(freebob_version, freebob_major_version.freebob_minor_version.freebob_micro_version)

trunk/libfreebob/libfreebob/freebob_streaming.h

@@ -108 +108 @@
-        int nb_buffers; /* the size of the frame buffer (in periods) */
-
-        /* RAW1394 related settings */
-        int iso_buffers;
-        int iso_prebuffers;
-        int iso_irq_interval;
-        
-        /* packetizer thread options */
-        int realtime;
@@ -121 +116 @@
-        int port;
-        
-
-        /* direction map */
-        int directions;

trunk/libfreebob/src/libfreebobstreaming/freebob_connections.c

@@ -118 +118 @@
-        connection->status.xruns = 0;
-        connection->status.packets=0;   
+
+#ifdef DEBUG
+        connection->status.total_packets_prev=0;
+#endif
+
-        connection->status.dropped=0;
-
+
-        // make sure the connection is polled next time
-        if(connection->pfd) { // this can be called before everything is init'ed
@@ -146 +151 @@
-        }
-        raw1394_set_userdata(connection->raw_handle, (void *)connection);
-        
-        // these have quite some influence on latency
-        connection->iso.buffers = dev->options.iso_buffers;
-        connection->iso.prebuffers = dev->options.iso_prebuffers;
-        connection->iso.irq_interval = dev->options.iso_irq_interval;
-        
-        connection->iso.speed = RAW1394_ISO_SPEED_400;

trunk/libfreebob/src/libfreebobstreaming/freebob_connections.h

@@ -152 +152 @@
-        int irq_interval;
-        int startcycle;
-
+
+
-        int iso_channel;
-        int do_disconnect;
-        int bandwidth;
+
+        int packets_per_period;
+        int max_packet_size; // tailored to result in optimal IRQ timing
+        int packet_size; // expected packet size
-        
-        int hostplug;
@@ -165 +170 @@
-        int packets;
-        int events;
-        //int total_packets;
-        int total_packets_prev;
-        int total_events;
-
@@ -179 +182 @@
-        int dropped;
-        
+        
+#ifdef DEBUG
-        int fdf;
-
+int total_packets_prev;
-        int last_cycle; 
+#endif
-
-        int packet_info_table_size;

trunk/libfreebob/src/libfreebobstreaming/freebob_streaming.c

@@ -101 +101 @@
-        printMessage("  Period Size              : %d\n",options.period_size);
-        printMessage("  Nb Buffers               : %d\n",options.nb_buffers);
-        printMessage("  RAW1394 ISO Buffers      : %d\n",options.iso_buffers);
-        printMessage("  RAW1394 ISO Prebuffers   : %d\n",options.iso_prebuffers);
-        printMessage("  RAW1394 ISO IRQ Interval : %d\n",options.iso_irq_interval);
-        printMessage("  Directions               : %X\n",options.directions);
-        
@@ -561 +558 @@
-                err=0;
-                freebob_connection_t *connection= &(dev->connections[i]);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                //connection->plug=0;
-                connection->iso.hostplug=-1;
@@ -596 +636 @@
-                                
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        } else {
-
-
-
-
-
-
-
-
-
-
-
+
-                        }
-
+
-                break;
-                case FREEBOB_PLAYBACK:
@@ -651 +686 @@
-                                connection->status.master=NULL;
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                        iec61883_cip_init (
-                                &connection->status.cip, 
@@ -733 +699 @@
-                                IEC61883_MODE_BLOCKING_EMPTY);
-
+
+                        // setup the optimal parameters for the raw1394 ISO buffering
+                        connection->iso.packets_per_period=dev->options.period_size/syt_interval;
+                        // hardware interrupts occur when one DMA block is full, and the size of one DMA
+                        // block = PAGE_SIZE. Setting the max_packet_size makes sure that the HW irq is 
+                        // occurs at a period boundary (optimal CPU use)
+                        // note: try and use 2 interrupts per period for better latency.
+                        connection->iso.max_packet_size=getpagesize() / connection->iso.packets_per_period * 2;
+                        connection->iso.irq_interval=connection->iso.packets_per_period / 2;
+
+                        connection->iso.packet_size=4 * (2 + syt_interval * connection->spec.dimension);
+
+                        if (connection->iso.max_packet_size < connection->iso.packet_size) {
+                                connection->iso.max_packet_size=connection->iso.packet_size;
+                        }
+
+                        /* the transmit buffer size should be as low as possible for latency. 
+                        */
+                        connection->iso.buffers=connection->iso.packets_per_period;
+                        if (connection->iso.buffers<10) connection->iso.buffers=10;
+
-                break;
-                }
@@ -741 +728 @@
-                        while(i>=0) {
-                                connection= &(dev->connections[i]);
-                
-                                // not nescessary anymore since it moved to the iso_start function
-/*                              debugPrint(DEBUG_LEVEL_STARTUP, "Shutdown connection %d on channel %d ...\n", i, connection->iso.iso_channel);
-                                
-                                raw1394_iso_shutdown(connection->raw_handle);
-*/
-                
-                                if (connection->iso.do_disconnect) {
@@ -843 +824 @@
-        debugPrint(DEBUG_LEVEL_STARTUP,"Armed...\n");
-        
-        //freebob_streaming_start_iso(dev);
-        
-        freebob_streaming_start_thread(dev);
-
@@ -857 +836 @@
-        freebob_streaming_stop_thread(dev);
-        
-        //freebob_streaming_stop_iso(dev);
-
-        // stop ISO xmit/receive
-        for(i=0; i < dev->nb_connections; i++) {
-                freebob_connection_t *connection= &(dev->connections[i]);
-
-                // this moved to iso_connection_stop in order to work around a raw1394 bug
-#if 0
-                debugPrint(DEBUG_LEVEL_STARTUP, "Shutdown connection %d on channel %d ...\n", i, connection->iso.iso_channel);
-                
-                raw1394_iso_shutdown(connection->raw_handle);
-#endif
-
-                if (connection->iso.do_disconnect) {
@@ -1449 +1419 @@
-                connection->status.dropped=0;           
-                if (connection->spec.is_master) { //master connection
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        raw1394_iso_recv_init(
-                                        connection->raw_handle, 
-                                        iso_master_receive_handler, 
-
-
-
-
-
+
+
-                                        connection->iso.iso_channel, 
-
-
-
+
-                                        connection->iso.irq_interval);
-
-                } else {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        raw1394_iso_recv_init(  
-                                        connection->raw_handle, 
-                                        iso_slave_receive_handler, 
-
-
-
-
-
+
+
-                                        connection->iso.iso_channel, 
-
-
-
+
-                                        connection->iso.irq_interval);
-                }
-                
-
+
+
+
-                        
-                err = raw1394_iso_recv_start(
@@ -1502 +1486 @@
-                
-                if (connection->spec.is_master) { // master connection
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                                
-                        raw1394_iso_xmit_init(
@@ -1509 +1503 @@
-                                        iso_master_transmit_handler, 
-                                        connection->iso.buffers,
-AMDTP_MAX_PACKET_SIZE
+connection->iso.max_packet_size
-                                        connection->iso.iso_channel, 
-                                        RAW1394_ISO_SPEED_400, 
@@ -1515 +1509 @@
-                } else {
-                        
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        raw1394_iso_xmit_init(
-                                        connection->raw_handle, 
-                                        iso_slave_transmit_handler, 
-                                        connection->iso.buffers,
-AMDTP_MAX_PACKET_SIZE
+connection->iso.max_packet_size
-                                        connection->iso.iso_channel, 
-                                        RAW1394_ISO_SPEED_400, 
-
-
-
+
+
+
+
+
+
+
-                        
-                err=raw1394_iso_xmit_start(
-       
-
-
+
+       
+       
-
-                if (err) {
@@ -1716 +1724 @@
-        debugPrint(DEBUG_LEVEL_STARTUP, "Go Go Go!!!\n");
-        
-        //sem_post(&dev->packetizer.transfer_ack);
-#define POLL_BASED      
-#ifdef POLL_BASED 
-        while (dev->packetizer.run && !underrun_detected) {
-                //sem_wait(&dev->packetizer.transfer_ack);
-                
-                freebob_streaming_period_reset(dev);
@@ -1754 +1760 @@
-                                }
-                                
-//                              if(dev->pfds[i].revents & (POLLIN | POLLPRI)) {
-                                if(dev->pfds[i].revents & (POLLIN)) {
-                                        // FIXME: this can segfault 
@@ -1788 +1793 @@
-                if(underrun_detected) {
-                        dev->xrun_detected=TRUE;
-                        //underrun_detected=0;
-                }
-
-#else
-        while (dev->packetizer.run && !underrun_detected) {
-                //sem_wait(&dev->packetizer.transfer_ack);
-                
-                freebob_streaming_period_reset(dev);
@@ -1836 +1839 @@
-                                connection = &(dev->connections[c]);
-                                
-                                // skip the sync master and the connections that are finished
-                                //if ((connection == dev->sync_master_connection) || (connection->status.frames_left <= 0))
-                                        
-                                if ((connection == dev->sync_master_connection))
-                                                continue;
@@ -1865 +1865 @@
-                if(underrun_detected) {
-                        dev->xrun_detected=TRUE;
-                                //underrun_detected=0;
-                }
-        
@@ -1883 +1882 @@
-
-#ifdef DEBUG
-                // update the packet counter
-                if((dev->sync_master_connection->status.packets - dev->sync_master_connection->status.total_packets_prev) > 1024*2) {
-//              if(1) {
-                        unsigned int i;
-                        debugPrintShort(DEBUG_LEVEL_PACKETCOUNTER,"\r -> ");
@@ -1893 +1890 @@
-                                assert(connection);
-                                
-                                /* Debug info format:
-                                * [direction, packetcount, bufferfill, packetdrop
-                                */
-                                debugPrintShort(DEBUG_LEVEL_PACKETCOUNTER,"[%s, %02d, %10d, %04d, %4d, (R: %04d)]", 
-                                        (connection->spec.direction==FREEBOB_CAPTURE ? "C" : "P"),
@@ -1950 +1944 @@
-}
-
-
+line in
-                                                                  quadlet_t* events, 
-                                                                  unsigned int nsamples,
@@ -1984 +1978 @@
-                        written=0;
-                        
-//                      debugPrint(DEBUG_LEVEL_PACKETCOUNTER, "Stream %d,%d,%d is midi, dbc=%d  [",s,stream->spec.location,stream->spec.position,dbc);
-                                                
-//                      for(j = (dbc%8)+stream->spec.location-1; j < nsamples; j += 8) {
-                        for(j = (dbc & 0x07)+stream->spec.location-1; j < nsamples; j += 8) {
-                                target_event=(quadlet_t *)(events + ((j * connection->spec.dimension) + stream->spec.position));
@@ -1992 +1983 @@
-                                if(IEC61883_AM824_GET_LABEL(sample_int) != IEC61883_AM824_LABEL_MIDI_NO_DATA) {
-                                        *(buffer)=(sample_int >> 16);
-//                                      debugPrintShort(DEBUG_LEVEL_PACKETCOUNTER, "%08X-%08X-%d ",*target_event,*buffer,((j * connection->spec.dimension) + stream->spec.position));
-                                        buffer++;
-                                        written++;
@@ -2002 +1992 @@
-                                printMessage("MIDI OUT bytes lost (%d/%d)",written_to_rb,written);
-                        }
-//                      debugPrintShort(DEBUG_LEVEL_PACKETCOUNTER, "]\n");
-                        
-                        
-                        /*                                              
-                        for(j = 0; j < nsamples; j += 1) {
-                                target_event=(quadlet_t *)(events + j);
-                                quadlet_t sample_int=ntohl(*target_event);
-                                *(buffer)=sample_int;
-                                buffer++;
-                                written++;
-
-                        }
-                        written=freebob_ringbuffer_write(stream->buffer, (char *)(stream->user_buffer), written*sizeof(quadlet_t))/sizeof(quadlet_t);
-                        */
-                }
-        }
@@ -2027 +2003 @@
- */
-
-
+line in
-                                                                quadlet_t* events, 
-                                                                unsigned int nsamples,
@@ -2081 +2057 @@
-                                stream->midi_counter--;
-                        }
-                        /*                      
-                        for(j=0; (j < nsamples); j++) {
-                                target_event=(quadlet_t *)(events + ((j * connection->spec.dimension) + stream->spec.position));
-                                
-                                hexDumpQuadlets( target_event,1);
-                        }
-                        */
-                        
-                }
-        }
@@ -2106 +2074 @@
-        unsigned int dropped)
-{
-
-
-
-
+
-
-        freebob_connection_t *connection=(freebob_connection_t *) raw1394_get_userdata (handle);
@@ -2118 +2083 @@
-        
-        // FIXME: dropped packets are very bad when transmitting and the other side is sync'ing on that!
-        //connection->status.packets+=dropped;
-        connection->status.dropped+=dropped;
-
+
+
-        connection->status.last_cycle=cycle;
+#endif
-
-        if((packet->fmt == 0x10) && (packet->fdf != 0xFF) && (packet->dbs>0) && (length>=2*sizeof(quadlet_t))) {
@@ -2129 +2095 @@
-
-                assert(connection->spec.dimension == packet->dbs);
-                
-//              if(nevents>2) {
-//                      quadlet_t *t=(quadlet_t *)(data+8);
-//                      t+=2;
-//                      
-//                      t++;
-//                      *t=0x40000000 | ((cntr) & 0xFFFFFF);
-//                      t++;
-//                      *t=0x40000000 | ((cntr++) & 0xFFFFFF);
-//              }
-                
-                if (freebob_ringbuffer_write(
@@ -2159 +2115 @@
-                // keep track of the total amount of events received
-                connection->status.events+=nevents;
-
+
+
-                connection->status.fdf=packet->fdf;
-
-
-
-
-
+
+
-        } else {
-                // discard packet
@@ -2189 +2143 @@
-                return RAW1394_ISO_DEFER;
-        }
-
-
-
-
+
-        return retval;
-}
@@ -2211 +2162 @@
-        /* TODO: implement correct SYT behaviour */
-                
-//      int xrun=0;
-
-        freebob_connection_t *connection=(freebob_connection_t *) raw1394_get_userdata (handle);
-        assert(connection);
@@ -2223 +2172 @@
-        connection->status.dropped+=dropped;
-
+#ifdef DEBUG    
-        connection->status.last_cycle=cycle;
+#endif
-
-        if((packet->fmt == 0x10) && (packet->fdf != 0xFF) && (packet->dbs>0) && (length>=2*sizeof(quadlet_t))) {
-                unsigned int nevents=((length / sizeof (quadlet_t)) - 2)/packet->dbs;
+
+#ifdef DEBUG    
-                connection->status.fdf=packet->fdf;
+#endif
-                
-                // add the data payload to the ringbuffer
@@ -2261 +2215 @@
-        if(packet->dbs) {
-                debugPrintWithTimeStamp(DEBUG_LEVEL_HANDLERS_LOWLEVEL, 
-
-
-
+
+
+
+
+
+
+
+
-        }
-                
@@ -2271 +2230 @@
-                return RAW1394_ISO_DEFER;
-        }
-
-
-
-
+
-        return retval;
-}
@@ -2305 +2261 @@
-        // construct the packet cip
-        int nevents = iec61883_cip_fill_header (handle, &connection->status.cip, packet);
-//      int xrun=0;
-        int nsamples=0;
-        int bytes_read;
-        
-
-
-
-
+
-        connection->status.last_cycle=cycle;
-
-
-
-
-
-
-
-
-
-
+
-        if(packet->fdf != 0xFF) {
-                connection->status.fdf=packet->fdf;
-        }
+#endif
+
+        enum raw1394_iso_disposition retval = RAW1394_ISO_OK;
+
+
-
-        if (nevents > 0) {
@@ -2341 +2289 @@
-        
-        // dropped packets are very bad when transmitting and the other side is sync'ing on that!
-        //connection->status.packets+=dropped;
-        connection->status.dropped += dropped;
-                
-        if (nsamples > 0) {
-                
-                if(freebob_ringbuffer_read(connection->timestamp_buffer,(char *)&tstamp,sizeof(freebob_timestamp_t))) {
-                        packet->syt=tstamp.syt+connection->total_delay;
-                }
-
-                assert(connection->spec.dimension == packet->dbs);
@@ -2368 +2311 @@
-        }
-        
-//      if (xrun) {
-//              printError("SLAVE XMT: Buffer underrun!\n");
-//              connection->status.xruns++;
-//              retval=RAW1394_ISO_DEFER;
-//              nsamples=0;
-//      }
-
-        *length = nsamples * connection->spec.dimension * sizeof (quadlet_t) + 8;
-        *tag = IEC61883_TAG_WITH_CIP;
@@ -2394 +2330 @@
-                                                                nevents, nsamples);
-        }
-
+
-        if((connection->status.frames_left<=0)) {
-                connection->pfd->events=0;
-                return RAW1394_ISO_DEFER;
-        }
-
-
-
-
+
-        return retval;
-
@@ -2427 +2360 @@
-        
-        int nevents = iec61883_cip_fill_header (handle, &connection->status.cip, packet);
-//      int xrun=0;
-        int nsamples=0;
-        int bytes_read;
-
-
-
-
+
+
-        connection->status.last_cycle=cycle;
-
-
-
-
-
-
-
-
-
-
+
-        if(packet->fdf != 0xFF) {
-                connection->status.fdf=packet->fdf;
-        }
+#endif
+
+        enum raw1394_iso_disposition retval = RAW1394_ISO_OK;
+
-
-        if (nevents > 0) {
@@ -2467 +2392 @@
-        if (nsamples > 0) {
-                int bytes_to_read=nsamples*sizeof(quadlet_t)*connection->spec.dimension;
-
-                if(freebob_ringbuffer_read(connection->timestamp_buffer,(char *)&tstamp,sizeof(freebob_timestamp_t))) {
-                        packet->syt=tstamp.syt+connection->total_delay;
-                }
-
-                assert(connection->spec.dimension == packet->dbs);
@@ -2508 +2429 @@
-                        freebob_streaming_encode_midi(connection,(quadlet_t *)(data+8), nevents, packet->dbc);
-                }
-//              hexDumpQuadlets( data,nsamples*connection->spec.dimension+2);
-        }
-        
@@ -2531 +2451 @@
-        }
-
-/*
+
-                connection->pfd->events=0;
-                return RAW1394_ISO_DEFER;
-        }
-
-
-
-
+
-        return retval;
-
@@ -2585 +2502 @@
-                case freebob_buffer_type_per_stream:
-                default:
-//                      assert(nsamples < dev->options.period_size);
-                        
-                        // use the preallocated buffer (at init time)
-                        buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
@@ -2618 +2533 @@
-                                for(j = 0; j < nsamples; j += 1) { // decode max nsamples
-                                        *(buffer)=(ntohl((*target_event) ) & 0x00FFFFFF);
-                //                      fprintf(stderr,"[%03d, %02d: %08p %08X %08X]\n",j, stream->spec.position, target_event, *target_event, *buffer);
-                                        buffer++;
-                                        target_event+=dimension;
@@ -2624 +2538 @@
-                                break;
-                        case freebob_buffer_type_float:
-//                              assert(nsamples>=4);
-                                j=0;
-                                if(nsamples>3) {
-4
+3
-                                                tmp[0] = ntohl(*target_event);
-                                                target_event += dimension;
@@ -2653 +2566 @@
-                                        }
-                                }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                }
-                                asm volatile("emms");
@@ -2793 +2704 @@
-                                j=0;
-                                if(read>3) {
-4
+3
-                                                asm("movups %[floatbuff], %%xmm0\n\t"
-                                                                "mulps %[ssemult], %%xmm0\n\t"
@@ -2820 +2731 @@
-                                        }
-                                }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                }
+
-                                asm volatile("emms");
-                                break;

trunk/libfreebob/tests/streaming/testmidistreaming1.c

@@ -159 +159 @@
-        dev_options.nb_buffers=3;
-
-        dev_options.iso_buffers=100;
-        dev_options.iso_prebuffers=8;
-        dev_options.iso_irq_interval=8;
-        
-        dev_options.port=1;
-        dev_options.node_id=-1;

trunk/libfreebob/tests/streaming/teststreaming.c

@@ -73 +73 @@
-        dev_options.nb_buffers=3;
-
-        dev_options.iso_buffers=100;
-        dev_options.iso_prebuffers=8;
-        dev_options.iso_irq_interval=8;
-        
-        dev_options.port=0;
-        dev_options.node_id=-1;

trunk/libfreebob/tests/streaming/teststreaming2.c

@@ -76 +76 @@
-        dev_options.nb_buffers=3;
-
-        dev_options.iso_buffers=100;
-        dev_options.iso_prebuffers=8;
-        dev_options.iso_irq_interval=8;
-        
-        dev_options.port=1;
-        dev_options.node_id=-1;

trunk/libfreebob/tests/streaming/teststreaming3.c

@@ -78 +78 @@
-        dev_options.nb_buffers=3;
-
-        dev_options.iso_buffers=40;
-        dev_options.iso_prebuffers=4;
-        dev_options.iso_irq_interval=2;
-        
-        dev_options.port=0;
-        dev_options.node_id=-1;