/*
- * $Id: ORTEDomainApp.c,v 0.0.0.1 2003/08/21
+ * $Id: ORTEDomainApp.c,v 0.0.0.1 2003/08/21
*
* DEBUG: section 21 Domain application
- * 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@smoliku.cz
+ * Advisor: Pavel Pisa
+ * Project Responsible: Zdenek Hanzalek
* --------------------------------------------------------------------
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- */
-
-#include "orte.h"
+ *
+ */
+#include "orte_all.h"
/*****************************************************************************/
-ORTEDomain *
+ORTEDomain *
ORTEDomainAppCreate(int domain, ORTEDomainProp *prop,
- ORTEDomainAppEvents *events,Boolean suspended) {
- ORTEDomain *d;
- ObjectEntryOID *objectEntryOID;
- AppParams *appParams;
- CSTWriterParams cstWriterParams;
- CSTReaderParams cstReaderParams;
- char iflocal[MAX_INTERFACES*MAX_STRING_IPADDRESS_LENGTH];
- char sIPAddress[MAX_STRING_IPADDRESS_LENGTH];
- int i;
- u_int16_t port=0;
-
- debug(21,10) ("ORTEDomainAppCreate: start\n");
- //Create domainApplication
- d=MALLOC(sizeof(ORTEDomain));
- if (!d) return NULL; //no memory
- //initialization local values
- d->domain=domain;
- d->taskRecvMetatraffic.terminate=ORTE_TRUE;
- d->taskRecvUserdata.terminate=ORTE_TRUE;
- d->taskSend.terminate=ORTE_TRUE;
- d->taskRecvMetatraffic.sock.port=0;
- d->taskRecvUserdata.sock.port=0;
- d->taskSend.sock.port=0;
- PublParamsInit(&d->publPropDefault);
- SubsParamsInit(&d->subsPropDefault);
- //init structure objectEntry
- ObjectEntryHID_init_root_field(&d->objectEntry);
- pthread_rwlock_init(&d->objectEntry.objRootLock,NULL);
- htimerRoot_init_queue(&d->objectEntry);
- pthread_rwlock_init(&d->objectEntry.htimRootLock,NULL);
- pthread_mutex_init(&d->objectEntry.htimSendMutex, NULL);
- //publication,subscriptions
- d->publications.counter=d->subscriptions.counter=0;
- CSTWriter_init_root_field(&d->publications);
- CSTReader_init_root_field(&d->subscriptions);
- pthread_rwlock_init(&d->publications.lock,NULL);
- pthread_rwlock_init(&d->subscriptions.lock,NULL);
- //publication,subscriptions lists
- PublicationList_init_root_field(&d->psEntry);
- pthread_rwlock_init(&d->psEntry.publicationsLock,NULL);
- SubscriptionList_init_root_field(&d->psEntry);
- pthread_rwlock_init(&d->psEntry.subscriptionsLock,NULL);
-
- //pattern
- pthread_rwlock_init(&d->patternEntry.lock,NULL);
- ORTEPatternRegister(d,ORTEPatternCheckDefault,ORTEPatternMatchDefault,NULL);
- Pattern_init_head(&d->patternEntry);
-
- //create domainProp
- if (prop!=NULL) {
- memcpy(&d->domainProp,prop,sizeof(ORTEDomainProp));
- } else {
- ORTEDomainPropDefaultGet(&d->domainProp);
- }
-
- //print local IP addresses
- iflocal[0]=0;
- if (d->domainProp.IFCount) {
- for(i=0;i<d->domainProp.IFCount;i++)
- strcat(iflocal,IPAddressToString(d->domainProp.IFProp[i].ipAddress,sIPAddress));
- debug(21,2) ("ORTEDomainAppCreate: localIPAddres(es) %s\n",iflocal);
- } else{
- debug(21,2) ("ORTEDomainAppCreate: no activ interface card\n");
- }
-
- //DomainEvents
- if (events!=NULL) {
- memcpy(&d->domainEvents,events,sizeof(ORTEDomainAppEvents));
- } else {
- memset(&d->domainEvents,0,sizeof(ORTEDomainAppEvents));
- }
+ ORTEDomainAppEvents *events, Boolean suspended)
+{
+ ORTEDomain *d;
- //local buffers
- d->mbRecvMetatraffic.cdrStream.buffer=
- (u_int8_t*)MALLOC(d->domainProp.recvBuffSize);
- d->mbRecvUserdata.cdrStream.buffer=
- (u_int8_t*)MALLOC(d->domainProp.recvBuffSize);
- d->mbSend.cdrStream.buffer=
- (u_int8_t*)MALLOC(d->domainProp.sendBuffSize);
- if ((!d->mbRecvMetatraffic.cdrStream.buffer) ||
- (!d->mbRecvUserdata.cdrStream.buffer) ||
- (!d->mbSend.cdrStream.buffer)) { //no memory
- FREE(d->mbRecvMetatraffic.cdrStream.buffer);
- FREE(d->mbRecvUserdata.cdrStream.buffer);
- FREE(d->mbSend.cdrStream.buffer);
- FREE(d);
- return NULL;
- }
- d->mbRecvMetatraffic.cdrStream.bufferPtr=d->mbRecvMetatraffic.cdrStream.buffer;
- d->mbRecvMetatraffic.cdrStream.length=0;
- d->mbRecvUserdata.cdrStream.bufferPtr=d->mbRecvUserdata.cdrStream.buffer;
- d->mbRecvUserdata.cdrStream.length=0;
- d->mbSend.cdrStream.bufferPtr=d->mbSend.cdrStream.buffer;
- d->mbSend.cdrStream.length=0;
+ debug(21, 10) ("ORTEDomainAppCreate: start\n");
- //TypeRegister
- ORTEType_init_root_field(&d->typeEntry);
- pthread_rwlock_init(&d->typeEntry.lock,NULL);
-
- //Sockets
- sock_init_udp(&d->taskRecvMetatraffic.sock);
- sock_init_udp(&d->taskRecvUserdata.sock);
- sock_init_udp(&d->taskSend.sock);
- if (d->domainProp.multicast.enabled) {
- Domain2PortMulticastMetatraffic(d->domain,port);
- } else {
- Domain2Port(d->domain,port);
- }
- sock_bind(&d->taskRecvMetatraffic.sock,0); //give me receiving port (metatraffic)
- debug(21,2) ("ORTEDomainAppCreate: Bind on port(RecvMetatraffic):%u\n",
- d->taskRecvMetatraffic.sock.port);
- sock_bind(&d->taskRecvUserdata.sock,0); //give me receiving port (userdata)
- debug(21,2) ("ORTEDomainAppCreate: Bind on port(RecvUserdata):%u\n",
- d->taskRecvUserdata.sock.port);
- sock_bind(&d->taskSend.sock,0); //give me sending port
- debug(21,2) ("ORTEDomainAppCreate: Bind on port(Send):%u\n",
- d->taskSend.sock.port);
- if ((d->taskRecvMetatraffic.sock.fd<0) ||
- (d->taskRecvUserdata.sock.fd<0) ||
- (d->taskSend.sock.fd<0)) {
- debug(21,0) ("Error creating socket(s).\n");
- sock_cleanup(&d->taskRecvMetatraffic.sock);
- sock_cleanup(&d->taskRecvUserdata.sock);
- sock_cleanup(&d->taskSend.sock);
- FREE(d->mbRecvMetatraffic.cdrStream.buffer);
- FREE(d->mbRecvUserdata.cdrStream.buffer);
- FREE(d->mbSend.cdrStream.buffer);
- FREE(d);
+ d = ORTEDomainCreate(domain, prop, events, ORTE_FALSE);
+ if (!d)
return NULL;
- }
- if (d->domainProp.multicast.enabled) {
- struct ip_mreq mreq;
- //ttl
- if(sock_setsockopt(&d->taskSend.sock,IP_MULTICAST_TTL,
- &d->domainProp.multicast.ttl,sizeof(d->domainProp.multicast.ttl))>=0) {
- debug(21,2) ("ORTEDomainAppCreate: ttl set on: %u\n",
- d->domainProp.multicast.ttl);
- }
- // join multicast group
- mreq.imr_multiaddr.s_addr=htonl(d->domainProp.multicast.ipAddress);
- mreq.imr_interface.s_addr=htonl(INADDR_ANY);
- if(sock_setsockopt(&d->taskRecvUserdata.sock,IP_ADD_MEMBERSHIP,
- (void *) &mreq, sizeof(mreq))>=0) {
- debug(21,2) ("ORTEDomainAppCreate: listening to mgroup %s\n",
- IPAddressToString(d->domainProp.multicast.ipAddress,sIPAddress));
- }
- }
-
- //Generates local GUID
- if (d->domainProp.IFCount>0)
- d->guid.hid=d->domainProp.IFProp[0].ipAddress;
- else
- d->guid.hid=StringToIPAddress("127.0.0.1");
- d->guid.aid=(d->taskSend.sock.port<<8)+MANAGEDAPPLICATION;
- d->guid.oid=OID_APP;
- debug(29,2) ("ORTEDomainAppCreate: GUID: %#10.8x,%#10.8x,%#10.8x\n",
- d->guid.hid,d->guid.aid,d->guid.oid);
- //create HEADER of message for sending task
- RTPSHeaderCreate(d->mbSend.cdrStream.buffer,d->guid.hid,d->guid.aid);
- d->mbSend.cdrStream.bufferPtr=
- d->mbSend.cdrStream.buffer+RTPS_HEADER_LENGTH;
- d->mbSend.cdrStream.length=RTPS_HEADER_LENGTH;
- d->mbSend.needSend=ORTE_FALSE;
- d->mbSend.containsInfoReply=ORTE_FALSE;
-
- //Self object data & fellow managers object data
- appParams=(AppParams*)MALLOC(sizeof(AppParams));
- AppParamsInit(appParams);
- appParams->expirationTime=d->domainProp.baseProp.expirationTime;
- VENDOR_ID_OCERA(appParams->vendorId);
- appParams->hostId=d->guid.hid;
- appParams->appId=d->guid.aid;
- appParams->metatrafficUnicastPort=d->taskRecvMetatraffic.sock.port;
- appParams->userdataUnicastPort=d->taskRecvUserdata.sock.port;
- if (d->domainProp.multicast.enabled) {
- //multicast
- for(i=0;i<d->domainProp.IFCount;i++)
- appParams->metatrafficMulticastIPAddressList[i]=d->domainProp.IFProp[i].ipAddress;
- appParams->metatrafficMulticastIPAddressCount=d->domainProp.IFCount;
- } else {
- //unicast
- if (d->domainProp.IFCount) {
- for(i=0;i<d->domainProp.IFCount;i++)
- appParams->unicastIPAddressList[i]=d->domainProp.IFProp[i].ipAddress;
- appParams->unicastIPAddressCount=d->domainProp.IFCount;
- } else {
- appParams->unicastIPAddressList[0]=StringToIPAddress("127.0.0.1");
- appParams->unicastIPAddressCount=1;
- }
- }
- //ApplicatonKeyList
- appParams->managerKeyList[0]=StringToIPAddress("127.0.0.1");
- for(i=0;i<d->domainProp.IFCount;i++)
- appParams->managerKeyList[i+1]=d->domainProp.IFProp[i].ipAddress;
- appParams->managerKeyCount=d->domainProp.IFCount+1;
- d->appParams=appParams;
- //insert object, doesn't need to be locked
- d->objectEntryOID=objectEntryAdd(d,&d->guid,(void*)appParams);
- d->objectEntryOID->private=ORTE_TRUE;
-
- //CST objects
- // writerApplicationSelf (WAS)
- NTPTIME_ZERO(cstWriterParams.waitWhileDataUnderwayTime);
- cstWriterParams.refreshPeriod=d->domainProp.baseProp.refreshPeriod;
- cstWriterParams.repeatAnnounceTime=d->domainProp.baseProp.repeatAnnounceTime;
- NTPTIME_ZERO(cstWriterParams.delayResponceTime);
- cstWriterParams.HBMaxRetries=d->domainProp.baseProp.HBMaxRetries;
- cstWriterParams.fullAcknowledge=ORTE_TRUE;
- CSTWriterInit(d,&d->writerApplicationSelf,d->objectEntryOID,
- OID_WRITE_APPSELF,&cstWriterParams,NULL);
- // add to WAS remote writer(s)
- if (d->domainProp.appLocalManager) {
- GUID_RTPS guid;
- guid.hid=d->domainProp.appLocalManager;
- guid.aid=AID_UNKNOWN;
- guid.oid=OID_APP;
- if (!objectEntryFind(d,&guid)) {
- appParams=(AppParams*)MALLOC(sizeof(AppParams));
- AppParamsInit(appParams);
- appParams->hostId=guid.hid;
- appParams->appId=guid.aid;
- appParams->metatrafficUnicastPort=port;
- appParams->userdataUnicastPort=0; //Manager support only metatraffic
- appParams->unicastIPAddressList[0]=d->domainProp.appLocalManager;
- appParams->unicastIPAddressCount=1;
- objectEntryOID=objectEntryAdd(d,&guid,(void*)appParams);
- CSTWriterAddRemoteReader(d,&d->writerApplicationSelf,objectEntryOID,
- OID_READ_MGR);
- debug(21,2) ("ORTEDomainAppCreate: add fellow manager (%s)\n",
- IPAddressToString(d->domainProp.appLocalManager,sIPAddress));
- }
- }
- // readerManagers
- cstReaderParams.delayResponceTimeMin=d->domainProp.baseProp.delayResponceTimeACKMin;
- cstReaderParams.delayResponceTimeMax=d->domainProp.baseProp.delayResponceTimeACKMax;
- cstReaderParams.ACKMaxRetries=d->domainProp.baseProp.ACKMaxRetries;
- cstReaderParams.repeatActiveQueryTime=d->domainProp.baseProp.repeatActiveQueryTime;
- cstReaderParams.fullAcknowledge=ORTE_TRUE;
- CSTReaderInit(d,&d->readerManagers,d->objectEntryOID,
- OID_READ_MGR,&cstReaderParams,NULL);
- // readerApplications
- cstReaderParams.delayResponceTimeMin=d->domainProp.baseProp.delayResponceTimeACKMin;
- cstReaderParams.delayResponceTimeMax=d->domainProp.baseProp.delayResponceTimeACKMax;
- cstReaderParams.ACKMaxRetries=d->domainProp.baseProp.ACKMaxRetries;
- cstReaderParams.repeatActiveQueryTime=d->domainProp.baseProp.repeatActiveQueryTime;
- cstReaderParams.fullAcknowledge=ORTE_TRUE;
- CSTReaderInit(d,&d->readerApplications,d->objectEntryOID,
- OID_READ_APP,&cstReaderParams,NULL);
- // writerPublications
- NTPTIME_ZERO(cstWriterParams.waitWhileDataUnderwayTime);
- cstWriterParams.refreshPeriod=d->domainProp.baseProp.refreshPeriod;
- cstWriterParams.repeatAnnounceTime=d->domainProp.baseProp.repeatAnnounceTime;
- NtpTimeAssembFromMs(cstWriterParams.delayResponceTime,0,20);
- cstWriterParams.HBMaxRetries=d->domainProp.baseProp.HBMaxRetries;
- cstWriterParams.fullAcknowledge=ORTE_TRUE;
- CSTWriterInit(d,&d->writerPublications,d->objectEntryOID,
- OID_WRITE_PUBL,&cstWriterParams,NULL);
- // writerSubscriptions
- NTPTIME_ZERO(cstWriterParams.waitWhileDataUnderwayTime);
- cstWriterParams.refreshPeriod=d->domainProp.baseProp.refreshPeriod;
- cstWriterParams.repeatAnnounceTime=d->domainProp.baseProp.repeatAnnounceTime;
- NtpTimeAssembFromMs(cstWriterParams.delayResponceTime,0,20);
- cstWriterParams.HBMaxRetries=d->domainProp.baseProp.HBMaxRetries;
- cstWriterParams.fullAcknowledge=ORTE_TRUE;
- CSTWriterInit(d,&d->writerSubscriptions,d->objectEntryOID,
- OID_WRITE_SUBS,&cstWriterParams,NULL);
- // readerPublications
- cstReaderParams.delayResponceTimeMin=d->domainProp.baseProp.delayResponceTimeACKMin;
- cstReaderParams.delayResponceTimeMax=d->domainProp.baseProp.delayResponceTimeACKMax;
- cstReaderParams.ACKMaxRetries=d->domainProp.baseProp.ACKMaxRetries;
- cstReaderParams.repeatActiveQueryTime=d->domainProp.baseProp.repeatActiveQueryTime;
- cstReaderParams.fullAcknowledge=ORTE_TRUE;
- CSTReaderInit(d,&d->readerPublications,d->objectEntryOID,
- OID_READ_PUBL,&cstReaderParams,NULL);
- // readerSubscriptions
- cstReaderParams.delayResponceTimeMin=d->domainProp.baseProp.delayResponceTimeACKMin;
- cstReaderParams.delayResponceTimeMax=d->domainProp.baseProp.delayResponceTimeACKMax;
- cstReaderParams.ACKMaxRetries=d->domainProp.baseProp.ACKMaxRetries;
- cstReaderParams.repeatActiveQueryTime=d->domainProp.baseProp.repeatActiveQueryTime;
- cstReaderParams.fullAcknowledge=ORTE_TRUE;
- CSTReaderInit(d,&d->readerSubscriptions,d->objectEntryOID,
- OID_READ_SUBS,&cstReaderParams,NULL);
-
- //add csChange for WAS
- appSelfParamChanged(d,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE);
-
//Start threads
if (!suspended) {
- ORTEDomainStart(d,ORTE_TRUE,ORTE_TRUE,ORTE_TRUE);
+ ORTEDomainStart(d, /* domain */
+ ORTE_TRUE, /* recvUnicastMetarafficThread */
+ d->domainProp.multicast.enabled, /* recvMulticastMetarafficThread */
+ ORTE_TRUE, /* recvUnicastUserdataThread */
+ d->domainProp.multicast.enabled, /* recvMulticastUserdataThread */
+ ORTE_TRUE); /* sendThread */
}
- debug(21,10) ("ORTEDomainAppCreate: finished\n");
+ debug(21, 10) ("ORTEDomainAppCreate: finished\n");
return d;
}
/*****************************************************************************/
Boolean
-ORTEDomainAppDestroy(ORTEDomain *d) {
- CSTWriter *cstWriter;
- CSTReader *cstReader;
-
- debug(21,10) ("ORTEDomainAppDestroy: start\n");
- if (!d) return ORTE_FALSE;
- //Stoping threads
- if (!d->taskRecvMetatraffic.terminate) {
- d->taskRecvMetatraffic.terminate=ORTE_TRUE;
- ORTEDomainWakeUpReceivingThread(d,
- &d->taskSend.sock,d->taskRecvMetatraffic.sock.port);
- pthread_join(d->taskRecvMetatraffic.thread,NULL);
- }
- if (!d->taskRecvUserdata.terminate) {
- d->taskRecvUserdata.terminate=ORTE_TRUE;
- ORTEDomainWakeUpReceivingThread(d,
- &d->taskSend.sock,d->taskRecvUserdata.sock.port);
- pthread_join(d->taskRecvUserdata.thread,NULL);
- }
- if (!d->taskSend.terminate) {
- d->taskSend.terminate=ORTE_TRUE;
- ORTEDomainWakeUpSendingThread(&d->objectEntry);
- pthread_join(d->taskSend.thread,NULL);
- }
- debug(21,3) ("ORTEDomainAppDestroy: threads stoped\n");
-
- //Sockets
- sock_cleanup(&d->taskRecvMetatraffic.sock);
- sock_cleanup(&d->taskRecvUserdata.sock);
- sock_cleanup(&d->taskSend.sock);
+ORTEDomainAppDestroy(ORTEDomain *d)
+{
+ Boolean ret;
- //Mutex(es)
- pthread_mutex_destroy(&d->objectEntry.htimSendMutex);
+ debug(21, 10) ("ORTEDomainAppDestroy: start\n");
- //rwLocks
- pthread_rwlock_destroy(&d->objectEntry.objRootLock);
- pthread_rwlock_destroy(&d->objectEntry.htimRootLock);
- pthread_rwlock_destroy(&d->publications.lock);
- pthread_rwlock_destroy(&d->subscriptions.lock);
- pthread_rwlock_destroy(&d->psEntry.publicationsLock);
- pthread_rwlock_destroy(&d->psEntry.subscriptionsLock);
+ ret = ORTEDomainDestroy(d, ORTE_FALSE);
- //TypeRegister
- ORTETypeRegisterDestroyAll(d);
- pthread_rwlock_destroy(&d->typeEntry.lock);
-
- //Pattern
- ORTEDomainAppSubscriptionPatternDestroyAll(d);
- pthread_rwlock_unlock(&d->typeEntry.lock);
- pthread_rwlock_destroy(&d->patternEntry.lock);
-
- //CSTReaders and CSTWriters
- CSTWriterDelete(d,&d->writerApplicationSelf);
- CSTReaderDelete(d,&d->readerManagers);
- CSTReaderDelete(d,&d->readerApplications);
- CSTWriterDelete(d,&d->writerPublications);
- CSTWriterDelete(d,&d->writerSubscriptions);
- CSTReaderDelete(d,&d->readerPublications);
- CSTReaderDelete(d,&d->readerSubscriptions);
-
- while ((cstWriter = CSTWriter_cut_first(&d->publications))) {
- CSTWriterDelete(d,cstWriter);
- FREE(cstWriter);
- }
- while ((cstReader = CSTReader_cut_first(&d->subscriptions))) {
- CSTReaderDelete(d,cstReader);
- FREE(cstReader);
- }
-
- //objects in objectsEntry
- objectEntryDeleteAll(d,&d->objectEntry);
-
- FREE(d->mbRecvMetatraffic.cdrStream.buffer);
- FREE(d->mbRecvUserdata.cdrStream.buffer);
- FREE(d->mbSend.cdrStream.buffer);
- FREE(d);
- debug(21,10) ("ORTEDomainAppDestroy: finished\n");
- return ORTE_TRUE;
+ debug(21, 10) ("ORTEDomainAppDestroy: finished\n");
+ return ret;
}
/*****************************************************************************/
-Boolean
-ORTEDomainAppSubscriptionPatternAdd(ORTEDomain *d,const char *topic,
- const char *type,ORTESubscriptionPatternCallBack subscriptionCallBack,
- void *param) {
+Boolean
+ORTEDomainAppSubscriptionPatternAdd(ORTEDomain *d, const char *topic,
+ const char *type, ORTESubscriptionPatternCallBack subscriptionCallBack,
+ void *param)
+{
PatternNode *pnode;
-
- if (!d) return ORTE_FALSE;
- pnode=(PatternNode*)MALLOC(sizeof(PatternNode));
- strcpy(pnode->topic,topic);
- strcpy(pnode->type,type);
- pnode->subscriptionCallBack=subscriptionCallBack;
- pnode->param=param;
+
+ if (!d)
+ return ORTE_FALSE;
+ pnode = (PatternNode *)MALLOC(sizeof(PatternNode));
+ strcpy((char *)pnode->topic, topic);
+ strcpy((char *)pnode->type, type);
+ pnode->subscriptionCallBack = subscriptionCallBack;
+ pnode->param = param;
pthread_rwlock_wrlock(&d->patternEntry.lock);
- Pattern_insert(&d->patternEntry,pnode);
+ Pattern_insert(&d->patternEntry, pnode);
pthread_rwlock_unlock(&d->patternEntry.lock);
return ORTE_TRUE;
}
/*****************************************************************************/
-Boolean
-ORTEDomainAppSubscriptionPatternRemove(ORTEDomain *d,const char *topic,
- const char *type) {
+Boolean
+ORTEDomainAppSubscriptionPatternRemove(ORTEDomain *d, const char *topic,
+ const char *type)
+{
PatternNode *pnode;
-
- if (!d) return ORTE_FALSE;
+
+ if (!d)
+ return ORTE_FALSE;
pthread_rwlock_wrlock(&d->patternEntry.lock);
- ul_list_for_each(Pattern,&d->patternEntry,pnode) {
- if ((strcmp(pnode->topic,topic)==0) &&
- (strcmp(pnode->type,type)==0)) {
- Pattern_delete(&d->patternEntry,pnode);
+ ul_list_for_each(Pattern, &d->patternEntry, pnode) {
+ if ((strcmp((const char *)pnode->topic, (const char *)topic) == 0) &&
+ (strcmp((const char *)pnode->type, (const char *)type) == 0)) {
+ Pattern_delete(&d->patternEntry, pnode);
FREE(pnode);
return ORTE_TRUE;
}
}
/*****************************************************************************/
-Boolean
-ORTEDomainAppSubscriptionPatternDestroyAll(ORTEDomain *d) {
+Boolean
+ORTEDomainAppSubscriptionPatternDestroy(ORTEDomain *d)
+{
PatternNode *pnode;
-
- if (!d) return ORTE_FALSE;
+
+ if (!d)
+ return ORTE_FALSE;
pthread_rwlock_wrlock(&d->patternEntry.lock);
- while((pnode=Pattern_cut_first(&d->patternEntry))) {
+ while ((pnode = Pattern_cut_first(&d->patternEntry)))
FREE(pnode);
- }
pthread_rwlock_unlock(&d->patternEntry.lock);
return ORTE_TRUE;
}
projects / orte.git / blobdiff