comparison core/NetworkSend.cpp @ 120:cdd441a304a9 scope-refactoring

Added read to interleaved buffer

 }
 
 void NetworkSend::setup(float aSampleRate){
 	setup(aSampleRate, 0, 9999, "192.168.7.1");//channelNumber=0
 }
-
 void NetworkSend::setup(float aSampleRate, int aChannelNumber, int aPort, const char *aServer){
 	staticConstructor(); //FIXME: ideally this should be in the constructor, but this is not currently possible
 						//because of limitations in BeagleRT_createAuxiliaryTask()
 	//keep track of added active instances
 	objAddrs.push_back(this);//TODO: this line should be in the constructor, but something weird happens if

 	// and objAddrs.size()==1 but when you get to setup, objAddrs.size() has reverted back to 0, without
 	// any destructor being called in between ...
 	setChannelNumber(aChannelNumber);
 	setPort(aPort);
 	setServer(aServer);
-	printf("Channel %d is sending messages to : %s:%d at %fHz\n", getChannelNumber(), aServer, aPort, aSampleRate);
+	printf("Channel %d is sending messages to: %s:%d at %fHz\n", getChannelNumber(), aServer, aPort, aSampleRate);
 }
 
 void NetworkSend::log(float value){ //TODO: add a vectorized version of this method
 	if(channel.index==(NETWORK_AUDIO_BUFFER_SIZE)){ // when the buffer is ready ...
 		channel.readyToBeSent=true;

 			printf("Network buffer underrun. timestamp: %d :-{\n", (int)channel.buffers[!channel.activeBuffer][1]);
 		}
 		channel.activeBuffer=!channel.activeBuffer; //switch buffer
 		channel.doneOnTime=false;
 		BeagleRT_scheduleAuxiliaryTask(NetworkSend::sendDataTask); //send the buffer
-		//TODO: maybe we should have transmitAudioTask running in a loop instead of scheduling it multiple times?
+		// TODO: maybe we should have transmitAudioTask running in a loop instead of scheduling it multiple times?
+		// The current solution allows to minimize latency when a single channel is used, as there is no inherent
+		// rt_task_sleep in the thread, as we are signaling it every time.
+		// Although, there is a possible race condition: if the auxiliaryTask is scheduled by channel 0,
+		// it might still be executing when channel 1 schedules it. But if the AuxTask has already skipped
+		// over channel 1, then we are at risk that channel 1 never gets sent.
 	}
 	if(channel.index==channel.headerLength){
 		channel.buffers[channel.activeBuffer][0] = (float)channel.channelNumber; //TODO: this could actually be done just once in setup()
 		channel.buffers[channel.activeBuffer][1]=(float)sampleCount; //timestamp
 		//add here more header fields

 void Scope::setPort(int port){
 	for(int n=0; n<getNumChannels(); n++){
 		channels[n].setPort(port);
 	}
 }
-void Scope::setPort(int channel, int port){
-	channels[channel].setPort(port);
+void Scope::setPort(int channel, int aPort){
+	channels[channel].setPort(aPort);
+	printf("Channel %d is now sending to port %d\n", channel, aPort);
 }
 
 int Scope::getNumChannels(){
 	return channels.size();
 }