epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fixed Mantis #290.

Browse Source
This commit is contained in:
Andrew Johnson
2007-11-13 23:27:35 +00:00
parent 4b7d838b20
commit 54ce8fbdbe
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/libCom/misc/cantProceed.c
View File

@@ -23,17 +23,15 @@
epicsShareFunc void * callocMustSucceed(size_t count, size_t size, const char *msg)
{
void * mem = NULL;
if (count == 0 || size == 0)
cantProceed("%s: callocMustSucceed(%lu, %lu) - bad args\n",
msg, (unsigned long)count, (unsigned long)size);
while ((mem = calloc(count, size)) == NULL) {
errlogPrintf("%s: callocMustSucceed(%lu, %lu) - calloc failed\n",
msg, (unsigned long)count, (unsigned long)size);
errlogPrintf("Thread %s (%p) suspending.\n",
epicsThreadGetNameSelf(), epicsThreadGetIdSelf());
errlogFlush();
epicsThreadSuspendSelf();
if (count > 0 && size > 0) {
while ((mem = calloc(count, size)) == NULL) {
errlogPrintf("%s: callocMustSucceed(%lu, %lu) - calloc failed\n",
msg, (unsigned long)count, (unsigned long)size);
errlogPrintf("Thread %s (%p) suspending.\n",
epicsThreadGetNameSelf(), epicsThreadGetIdSelf());
errlogFlush();
epicsThreadSuspendSelf();
}
}
return mem;
}
@@ -41,17 +39,15 @@ epicsShareFunc void * callocMustSucceed(size_t count, size_t size, const char *m
epicsShareFunc void * mallocMustSucceed(size_t size, const char *msg)
{
void * mem = NULL;
if (size == 0)
cantProceed("%s: mallocMustSucceed(%lu) - bad arg\n",
if (size > 0) {
while ((mem = malloc(size)) == NULL) {
errlogPrintf("%s: mallocMustSucceed(%lu) - malloc failed\n",
msg, (unsigned long)size);
while ((mem = malloc(size)) == NULL) {
errlogPrintf("%s: mallocMustSucceed(%lu) - malloc failed\n",
msg, (unsigned long)size);
errlogPrintf("Thread %s (%p) suspending.\n",
epicsThreadGetNameSelf(), epicsThreadGetIdSelf());
errlogFlush();
epicsThreadSuspendSelf();
errlogPrintf("Thread %s (%p) suspending.\n",
epicsThreadGetNameSelf(), epicsThreadGetIdSelf());
errlogFlush();
epicsThreadSuspendSelf();
}
}
return mem;
}