summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 4c27880)
raw | patch | inline | side by side (from parent 1: 4c27880)
author | Robert Tivy <rtivy@ti.com> | |
Fri, 26 Jun 2015 22:45:51 +0000 (15:45 -0700) | ||
committer | Robert Tivy <rtivy@ti.com> | |
Tue, 30 Jun 2015 01:00:37 +0000 (18:00 -0700) |
Addresses SDOCM00115404.
diff --git a/linux/src/api/Ipc.c b/linux/src/api/Ipc.c
index e81700c6762a388ab40b77b614dad93b6dab87fa..8bd74b521a6e426e74de73a1aa9533563ea05800 100644 (file)
--- a/linux/src/api/Ipc.c
+++ b/linux/src/api/Ipc.c
ladStatus = LAD_connect(&ladHandle);
if (ladStatus != LAD_SUCCESS) {
- printf("Ipc_start: LAD_connect() failed: %d\n", ladStatus);
+ fprintf(stderr, "Ipc_start: LAD_connect() failed: %d\n", ladStatus);
status = Ipc_E_FAIL;
goto exit;
}
status = NameServer_setup();
if (status < 0) {
- printf("Ipc_start: NameServer_setup() failed: %d\n", status);
+ fprintf(stderr, "Ipc_start: NameServer_setup() failed: %d\n", status);
status = Ipc_E_FAIL;
goto exit;
}
status = GateHWSpinlock_start();
if (status < 0) {
- printf("Ipc_start: GateHWSpinlock_start failed: %d\n", status);
+ fprintf(stderr, "Ipc_start: GateHWSpinlock_start failed: %d\n",
+ status);
status = Ipc_E_FAIL;
goto exit;
}
status = GateMP_start();
if (status < 0) {
- printf("Ipc_start: GateMP_start failed: %d\n", status);
+ fprintf(stderr, "Ipc_start: GateMP_start failed: %d\n", status);
status = Ipc_E_FAIL;
GateHWSpinlock_stop();
goto exit;
status = MessageQ_destroy();
if (status < 0) {
- printf("Ipc_stop: MessageQ_destroy() failed: %d\n", status);
+ fprintf(stderr, "Ipc_stop: MessageQ_destroy() failed: %d\n", status);
status = Ipc_E_FAIL;
goto exit;
}
status = NameServer_destroy();
if (status < 0) {
- printf("Ipc_stop: NameServer_destroy() failed: %d\n", status);
+ fprintf(stderr, "Ipc_stop: NameServer_destroy() failed: %d\n", status);
status = Ipc_E_FAIL;
goto exit;
}
ladStatus = LAD_disconnect(ladHandle);
if (ladStatus != LAD_SUCCESS) {
- printf("LAD_disconnect() failed: %d\n", ladStatus);
+ fprintf(stderr, "LAD_disconnect() failed: %d\n", ladStatus);
status = Ipc_E_FAIL;
goto exit;
}
done:
if (status < 0) {
/* report error */
- printf("Ipc_detach: Error %d, procId %d\n", status, procId);
+ fprintf(stderr, "Ipc_detach: Error %d, procId %d\n", status, procId);
}
pthread_mutex_unlock(&Ipc_module.gate);
index 46b13f84c2d5c6c5d8009f1cdac552f042e85465..8cad46f063ea16b05c6f6149be680d0ca2545708 100644 (file)
--- a/linux/src/api/MessageQ.c
+++ b/linux/src/api/MessageQ.c
UInt16 clusterId;
if (handle == NULL) {
- printf("MessageQ_registerTransport: invalid handle, must be non-NULL\n"
- );
+ fprintf(stderr,
+ "MessageQ_registerTransport: invalid handle, must be non-NULL\n"
+ );
return status;
}
clusterId = rprocId - MultiProc_getBaseIdOfCluster();
if (clusterId >= MultiProc_MAXPROCESSORS) {
- printf("MessageQ_registerTransport: invalid procId %d\n", rprocId);
+ fprintf(stderr,
+ "MessageQ_registerTransport: invalid procId %d\n", rprocId);
return status;
}
Bool MessageQ_registerTransportId(UInt tid, ITransport_Handle inst)
{
if (inst == NULL) {
- printf("MessageQ_registerTransportId: invalid NULL handle\n");
+ fprintf(stderr, "MessageQ_registerTransportId: invalid NULL handle\n");
return MessageQ_E_INVALIDARG;
}
if (tid >= MessageQ_MAXTRANSPORTS) {
- printf("MessageQ_unregisterNetTransport: invalid transport id %d,"
+ fprintf(stderr,
+ "MessageQ_unregisterNetTransport: invalid transport id %d, "
"must be < %d\n", tid, MessageQ_MAXTRANSPORTS);
return MessageQ_E_INVALIDARG;
}
if (MessageQ_module->transInst[tid] != NULL) {
- printf("MessageQ_registerTransportId: transport id %d already "
+ fprintf(stderr,
+ "MessageQ_registerTransportId: transport id %d already "
"registered\n", tid);
return MessageQ_E_ALREADYEXISTS;
clusterId = rprocId - MultiProc_getBaseIdOfCluster();
if (clusterId >= MultiProc_MAXPROCESSORS) {
- printf("MessageQ_unregisterTransport: invalid rprocId %d\n", rprocId);
+ fprintf(stderr, "MessageQ_unregisterTransport: invalid rprocId %d\n",
+ rprocId);
return;
}
Void MessageQ_unregisterTransportId(UInt tid)
{
if (tid >= MessageQ_MAXTRANSPORTS) {
- printf("MessageQ_unregisterTransportId: invalid transport id %d, "
+ fprintf(stderr,
+ "MessageQ_unregisterTransportId: invalid transport id %d, "
"must be < %d\n", tid, MessageQ_MAXTRANSPORTS);
return;
default:
/* error */
- printf("MessageQ_create: Error: transport id %d is an "
+ fprintf(stderr,
+ "MessageQ_create: Error: transport id %d is an "
"unsupported transport type.\n", tid);
break;
}
default:
/* error */
- printf("MessageQ_create: Error: transport id %d is an "
+ fprintf(stderr,
+ "MessageQ_create: Error: transport id %d is an "
"unsupported transport type.\n", tid);
break;
}
tid = MessageQ_getTransportId(msg);
if (tid >= MessageQ_MAXTRANSPORTS) {
- printf("MessageQ_put: Error: transport id %d too big, must be < %d\n",
+ fprintf(stderr,
+ "MessageQ_put: Error: transport id %d too big, must be < %d\n",
tid, MessageQ_MAXTRANSPORTS);
status = MessageQ_E_FAIL;
goto done;
baseTrans = MessageQ_module->transInst[tid];
if (baseTrans == NULL) {
- printf("MessageQ_put: Error: transport is null\n");
+ fprintf(stderr, "MessageQ_put: Error: transport is null\n");
status = MessageQ_E_FAIL;
goto done;
}
default:
/* error */
- printf("MessageQ_put: Error: transport id %d is an "
+ fprintf(stderr, "MessageQ_put: Error: transport id %d is an "
"unsupported transport type\n", tid);
status = MessageQ_E_FAIL;
break;
/* primary transport can only be used for intra-cluster delivery */
if (clusterId > MultiProc_getNumProcsInCluster()) {
- printf("MessageQ_put: Error: destination procId=%d is not "
+ fprintf(stderr,
+ "MessageQ_put: Error: destination procId=%d is not "
"in cluster. Must specify a transportId.\n", dstProcId);
status = MessageQ_E_FAIL;
goto done;
diff --git a/linux/src/daemon/lad.c b/linux/src/daemon/lad.c
index b9c740e2a69ee38d576c6c3c8b37cf94b37e7f5c..87fcbdefaaf846ea96458561a966283b602f079c 100644 (file)
--- a/linux/src/daemon/lad.c
+++ b/linux/src/daemon/lad.c
if ((chdir(LAD_ROOTDIR)) < 0) {
/* if can't change directory assume it needs to be created, do it */
if ((mkdir(LAD_ROOTDIR, 0666)) < 0) {
- printf("\nERROR: Failed to create LAD's root directory!\n");
+ fprintf(stderr,
+ "\nERROR: Failed to create LAD's root directory!\n");
exit(EXIT_FAILURE);
}
}
/* if can't change directory assume it needs to be created, do it */
if ((mkdir(LAD_WORKINGDIR, 0666)) < 0) {
- printf("\nERROR: Failed to create LAD's working directory!\n");
+ fprintf(stderr,
+ "\nERROR: Failed to create LAD's working directory!\n");
exit(EXIT_FAILURE);
}
/* now change to the new directory */
if ((chdir(LAD_WORKINGDIR)) < 0) {
- printf("\nERROR: Failed to change to LAD's working directory!\n");
+ fprintf(stderr,
+ "\nERROR: Failed to change to LAD's working directory!\n");
exit(EXIT_FAILURE);
}
}
case 'l':
logPtr = fopen(optarg, "w");
if (logPtr == NULL) {
- printf("\nERROR: unable to open log file %s\n", optarg);
+ fprintf(stderr, "\nERROR: unable to open log file %s\n",
+ optarg);
exit(EXIT_FAILURE);
}
else {
ipcCfg.procSync = Ipc_ProcSync_NONE;
}
else {
- printf("Error: bad synchronization specified, must be "
- "ALL|PAIR|NONE\n");
+ fprintf(stderr,
+ "Error: bad synchronization specified, must be "
+ "ALL|PAIR|NONE\n");
exit(EXIT_FAILURE);
}
if (_MultiProc_cfg.id == 0xFFFF ||
_MultiProc_cfg.baseIdOfCluster == 0xFFFF) {
- printf("\nBase cluster id is set to an INVALID value\n");
- printf("Use -b option to set value or modify the MultiProcCfg file\n");
+ fprintf(stderr, "\nBase cluster id is set to an INVALID value\n");
+ fprintf(stderr,
+ "Use -b option to set value or modify the MultiProcCfg file\n"
+ );
exit(EXIT_FAILURE);
}
if ((_MultiProc_cfg.baseIdOfCluster + _MultiProc_cfg.numProcsInCluster) >
_MultiProc_cfg.numProcessors) {
- printf("\nNumber of processors (%d) must be >= base cluster id + "
- "number of processors in cluster (%d + %d)\n",
- _MultiProc_cfg.numProcessors, _MultiProc_cfg.baseIdOfCluster,
- _MultiProc_cfg.numProcsInCluster);
- exit(EXIT_FAILURE);
+ fprintf(stderr,
+ "\nNumber of processors (%d) must be >= base cluster id + "
+ "number of processors in cluster (%d + %d)\n",
+ _MultiProc_cfg.numProcessors, _MultiProc_cfg.baseIdOfCluster,
+ _MultiProc_cfg.numProcsInCluster);
+ exit(EXIT_FAILURE);
}
/* if fork of child failed then exit immediately; no child created */
if (pid < 0) {
- printf("\nERROR: Failed to fork child process!");
+ fprintf(stderr, "\nERROR: Failed to fork child process!");
exit(EXIT_FAILURE);
}
/* exit with failure code if failed to get session ID... */
if (sid < 0) {
- printf("\nERROR: Failed to acquire new session ID!");
+ fprintf(stderr, "\nERROR: Failed to acquire new session ID!");
exit(EXIT_FAILURE);
}
index 102b3909a65529ae2d4df3cca56a3140b5ef10bc..ae426fb36ccceb78218faed05d4471d1bb88541b 100644 (file)
if (sock < 0) {
status = Ipc_E_FAIL;
- printf("TransportRpmsg_create: socket failed: %d (%s)\n", errno,
+ fprintf(stderr,
+ "TransportRpmsg_create: socket failed: %d (%s)\n", errno,
strerror(errno));
goto done;
}
if (status < 0) {
status = Ipc_E_FAIL;
- printf("TransportRpmsg_create: connect failed: %d (%s) procId: %d\n",
+ fprintf(stderr,
+ "TransportRpmsg_create: connect failed: %d (%s) procId: %d\n",
errno, strerror(errno), params->rprocId);
goto done;
}
/* Create the socket to receive messages for this messageQ. */
fd = socket(AF_RPMSG, SOCK_SEQPACKET, 0);
if (fd < 0) {
- printf("TransportRpmsg_bind: socket call failed: %d (%s)\n",
+ fprintf(stderr, "TransportRpmsg_bind: socket call failed: %d (%s)\n",
errno, strerror(errno));
status = MessageQ_E_OSFAILURE;
goto done;
err = send(sock, msg, msg->msgSize, 0);
if (err < 0) {
- printf("TransportRpmsg_put: send failed: %d (%s)\n",
- errno, strerror(errno));
+ fprintf(stderr, "TransportRpmsg_put: send failed: %d (%s)\n",
+ errno, strerror(errno));
status = FALSE;
goto exit;
/* transport input fd was signalled: get the message */
tmpStatus = transportGet(fd, &retMsg);
if (tmpStatus < 0 && tmpStatus != MessageQ_E_SHUTDOWN) {
- printf("rpmsgThreadFxn: transportGet failed on fd %d,"
- " returned %d\n", fd, tmpStatus);
+ fprintf(stderr,
+ "rpmsgThreadFxn: transportGet failed on fd %d, "
+ "returned %d\n", fd, tmpStatus);
}
else if (tmpStatus == MessageQ_E_SHUTDOWN) {
- printf("rpmsgThreadFxn: transportGet failed on fd %d,"
- " returned %d\n", fd, tmpStatus);
+ fprintf(stderr,
+ "rpmsgThreadFxn: transportGet failed on fd %d, "
+ "returned %d\n", fd, tmpStatus);
pthread_mutex_lock(&TransportRpmsg_module->gate);
MessageQ_shutdown(handle);
}
else {
- printf("rpmsgThreadFxn: MessageQ_getLocalHandle(0x%x) "
- "returned NULL, can't shutdown\n", queueId);
+ fprintf(stderr,
+ "rpmsgThreadFxn: MessageQ_getLocalHandle(0x%x) "
+ "returned NULL, can't shutdown\n", queueId);
}
}
else {
byteCount = recvfrom(sock, msg, MESSAGEQ_RPMSG_MAXSIZE, 0,
(struct sockaddr *)&fromAddr, &len);
if (len != sizeof (fromAddr)) {
- printf("recvfrom: got bad addr len (%d)\n", len);
+ fprintf(stderr, "recvfrom: got bad addr len (%d)\n", len);
status = MessageQ_E_FAIL;
goto freeMsg;
}
if (byteCount < 0) {
- printf("recvfrom failed: %s (%d)\n", strerror(errno), errno);
+ fprintf(stderr, "recvfrom failed: %s (%d)\n", strerror(errno), errno);
if (errno == ENOLINK) {
status = MessageQ_E_SHUTDOWN;
}
inst = calloc(clusterSize, sizeof(TransportRpmsg_Handle));
if (inst == NULL) {
- printf("Error: TransportRpmsg_Factory_create failed, no memory\n");
+ fprintf(stderr,
+ "Error: TransportRpmsg_Factory_create failed, no memory\n");
status = Ipc_E_MEMORY;
goto done;
}
TransportRpmsg_module->unblockEvent = eventfd(0, 0);
if (TransportRpmsg_module->unblockEvent == -1) {
- printf("create: unblock event failed: %d (%s)\n",
- errno, strerror(errno));
+ fprintf(stderr, "create: unblock event failed: %d (%s)\n",
+ errno, strerror(errno));
status = Ipc_E_FAIL;
goto done;
}
TransportRpmsg_module->waitEvent = eventfd(0, EFD_SEMAPHORE);
if (TransportRpmsg_module->waitEvent == -1) {
- printf("create: wait event failed: %d (%s)\n", errno, strerror(errno));
+ fprintf(stderr,
+ "create: wait event failed: %d (%s)\n", errno, strerror(errno));
status = Ipc_E_FAIL;
goto done;
}
if (status < 0) {
status = Ipc_E_FAIL;
- printf("attach: failed to spawn thread\n");
+ fprintf(stderr, "create: failed to spawn thread\n");
goto done;
}
TransportRpmsg_module->threadStarted = TRUE;
index acef72ec4c04431c82eb6376ec2276b600a18a81..8284b07475c0020dee2500f68e8367be65e45e92 100644 (file)
/* let's see what local address we got */
err = getsockname(sock, (struct sockaddr *)&srcAddr, &len);
if (err < 0) {
- printf("getpeername failed: %s (%d)\n", strerror(errno), errno);
+ fprintf(stderr, "getpeername failed: %s (%d)\n",
+ strerror(errno), errno);
return (-1);
}
/* let's see what local address we got */
err = getsockname(fd, (struct sockaddr *)&srcAddr, &len);
if (err < 0) {
- printf("getsockname failed: %s (%d)\n", strerror(errno), errno);
+ fprintf(stderr, "getsockname failed: %s (%d)\n",
+ strerror(errno), errno);
}
else {
PRINTVERBOSE2("\tsrc vproc_id: %d, src addr: %d\n",