JORTE: ignore 'int-to-pointer' and 'pointer-to-int' compiler warnings

[orte.git] / orte / liborte / ORTEAppSendThread.c

diff --git a/orte/liborte/ORTEAppSendThread.c b/orte/liborte/ORTEAppSendThread.c
index c8cfb66c789017b2903d3a1fa921e5e6878a3dc1..192ba7991db0d0aaaf331874e4f866207ab08b25 100644 (file)
--- a/orte/liborte/ORTEAppSendThread.c
+++ b/orte/liborte/ORTEAppSendThread.c
@@ -2,9 +2,19 @@
  *  $Id: ORTEAppSendThread.c,v 0.0.0.1  2003/08/21 
  *
  *  DEBUG:  section 24                  Sending thread
- *  AUTHOR: Petr Smolik                 petr.smolik@wo.cz
  *
- *  ORTE - OCERA Real-Time Ethernet     http://www.ocera.org/
+ *  -------------------------------------------------------------------  
+ *                                ORTE                                 
+ *                      Open Real-Time Ethernet                       
+ *                                                                    
+ *                      Copyright (C) 2001-2006                       
+ *  Department of Control Engineering FEE CTU Prague, Czech Republic  
+ *                      http://dce.felk.cvut.cz                       
+ *                      http://www.ocera.org                          
+ *                                                                    
+ *  Author:             Petr Smolik    petr.smolik@wo.cz             
+ *  Advisor:            Pavel Pisa                                   
+ *  Project Responsible: Zdenek Hanzalek                              
  *  --------------------------------------------------------------------
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -24,62 +34,82 @@
 /*****************************************************************************/
 void ORTESendData(ORTEDomain *d,ObjectEntryAID *objectEntryAID,Boolean meta) {
   struct sockaddr_in  des; 
-  ObjectEntryOID      *objectEntryOID;
+  ObjectEntryOID      *object;
   AppParams           *appParams;
-  ObjectId            oid=OID_APP;
   int                 i;
+  CDR_Codec          *cdrCodec=&d->taskSend.mb.cdrCodec;
+  Port               port;
 
-  objectEntryOID=ObjectEntryOID_find(objectEntryAID,&oid);
-  if (objectEntryOID) {
-    appParams=(AppParams*)objectEntryOID->attributes;
-    for(i=0;i<appParams->unicastIPAddressCount;i++) {
-      des.sin_family=AF_INET; 
-      des.sin_addr.s_addr = htonl(appParams->unicastIPAddressList[i]);
-      if (meta) {
-        des.sin_port = htons((uint16_t)appParams->metatrafficUnicastPort); 
-        sock_sendto (
-            &d->taskSend.sock,
-            d->mbSend.cdrStream.buffer,
-            d->mbSend.cdrStream.length,
-            &des,
-            sizeof(des)); 
-      } else {
-        des.sin_port = htons((uint16_t)appParams->userdataUnicastPort); 
-        if (d->mbSend.cdrStreamDirect)
-          sock_sendto (
-              &d->taskSend.sock,
-              d->mbSend.cdrStreamDirect->buffer,
-              d->mbSend.cdrStreamDirect->length,
-              &des,
-              sizeof(des)); 
-        else
-          sock_sendto (
-              &d->taskSend.sock,
-              d->mbSend.cdrStream.buffer,
-              d->mbSend.cdrStream.length,
-              &des,
-              sizeof(des)); 
+  object=objectEntryAID->aobject;
+  if (object) {
+    appParams=(AppParams*)object->attributes;
+    if (!ObjectEntryMulticast_is_empty(object)) {
+      for(i=0;i<appParams->metatrafficMulticastIPAddressCount;i++) {
+        des.sin_family=AF_INET; 
+        des.sin_addr.s_addr = htonl(appParams->metatrafficMulticastIPAddressList[i]);
+        des.sin_port = htons((uint16_t)object->multicastPort); 
+        if (d->taskSend.mb.cdrCodecDirect) {
+          sock_sendto (&d->taskSend.sock,
+                       d->taskSend.mb.cdrCodecDirect->buffer,
+                       d->taskSend.mb.cdrCodecDirect->wptr,
+                       &des,
+                       sizeof(des)); 
+        } else {
+          sock_sendto (&d->taskSend.sock,
+                      cdrCodec->buffer,
+                       cdrCodec->wptr,
+                       &des,
+                       sizeof(des)); 
+        }
+      }
+    } else {
+      for(i=0;i<appParams->unicastIPAddressCount;i++) {
+        des.sin_family=AF_INET; 
+        des.sin_addr.s_addr = htonl(appParams->unicastIPAddressList[i]);
+        if (meta) {
+         port=appParams->metatrafficUnicastPort;
+        } else {
+          port=appParams->userdataUnicastPort; 
+        }
+        des.sin_port = htons((uint16_t)port); 
+        if (d->taskSend.mb.cdrCodecDirect) {
+          sock_sendto (&d->taskSend.sock,
+                       d->taskSend.mb.cdrCodecDirect->buffer,
+                       d->taskSend.mb.cdrCodecDirect->wptr,
+                       &des,
+                       sizeof(des)); 
+        } else {
+          sock_sendto (&d->taskSend.sock,
+                      cdrCodec->buffer,
+                       cdrCodec->wptr,
+                       &des,
+                       sizeof(des)); 
+        }
       }
     }
+  } else {
+    debug(24,1) ("ORTEAppSendThread: no aobjectEntryOID connected to objectEntryAID!\n");
   }
   //prepare buffer for next sending
-  d->mbSend.cdrStream.length=RTPS_HEADER_LENGTH;
-  d->mbSend.cdrStream.bufferPtr=d->mbSend.cdrStream.buffer+RTPS_HEADER_LENGTH;
-  d->mbSend.needSend=ORTE_FALSE;
-  d->mbSend.containsInfoReply=ORTE_FALSE;
+  cdrCodec->wptr=RTPS_HEADER_LENGTH;
+  d->taskSend.mb.needSend=ORTE_FALSE;
+  d->taskSend.mb.containsInfoReply=ORTE_FALSE;
+  d->taskSend.mb.cdrCodecDirect=NULL;
 }
 
 /*****************************************************************************/
-void ORTEAppSendThread(ORTEDomain *d) {
+void ORTEAppSendThread(TaskProp *tp) {
   struct timespec     wtime; 
   NtpTime             actTime,nextExpire,whenExpire,sleepingTime;
   int32_t             s,ms;
+  ORTEDomain          *d=tp->d;
 
   debug(24,10) ("ORTEAppSendThread: start\n");
   d->objectEntry.htimNeedWakeUp=ORTE_TRUE;
 
-  while (!d->taskSend.terminate) {
+  while (!tp->terminate) {
     actTime=getActualNtpTime();
+
     pthread_rwlock_wrlock(&d->objectEntry.htimRootLock);
     if (htimerRoot_next_expire(&d->objectEntry,&nextExpire)==0) {
       NTPTIME_BUILD(whenExpire,300); //max time for sleeping (no. events)
@@ -91,6 +121,7 @@ void ORTEAppSendThread(ORTEDomain *d) {
     NtpTimeSub(sleepingTime,nextExpire,actTime);
     NtpTimeDisAssembToMs(s,ms,sleepingTime);
     if (s<0) s=ms=0;
+
     debug(24,4) ("ORTEAppSendThread: sleeping for %lis %lims\n",s,ms);
     if (!((wtime.tv_sec==0) && (wtime.tv_nsec==0))) {
       pthread_mutex_lock(&d->objectEntry.htimSendMutex);
@@ -102,12 +133,15 @@ void ORTEAppSendThread(ORTEDomain *d) {
       d->objectEntry.htimSendCondValue=0;
       pthread_mutex_unlock(&d->objectEntry.htimSendMutex);
     }
+
     debug(24,7) ("ORTEAppSendThread: fired\n");
     actTime=getActualNtpTime();
     pthread_rwlock_wrlock(&d->objectEntry.objRootLock);
     pthread_rwlock_wrlock(&d->objectEntry.htimRootLock);
     d->objectEntry.htimNeedWakeUp=ORTE_FALSE;
+
     htimerRoot_run_expired(d,&actTime);
+
     d->objectEntry.htimNeedWakeUp=ORTE_TRUE;
     pthread_rwlock_unlock(&d->objectEntry.htimRootLock);
     pthread_rwlock_unlock(&d->objectEntry.objRootLock);