jba changes through 2/7/91
This commit is contained in:
@@ -207,7 +207,6 @@ long dbProcess(paddr)
|
||||
struct dbCommon *precord=(struct dbCommon *)(paddr->precord);
|
||||
long status;
|
||||
|
||||
|
||||
/* If already active dont process */
|
||||
if(precord->pact) {
|
||||
struct rset *prset;
|
||||
@@ -215,7 +214,7 @@ long dbProcess(paddr)
|
||||
|
||||
/* raise scan alarm after MAX_LOCK times */
|
||||
if(precord->stat==SCAN_ALARM) return(0);
|
||||
if(precord->lcnt++ <=MAX_LOCK) return(0);
|
||||
if(precord->lcnt++ !=MAX_LOCK) return(0);
|
||||
precord->sevr = MAJOR_ALARM;
|
||||
precord->stat = SCAN_ALARM;
|
||||
precord->nsev = 0;
|
||||
@@ -239,7 +238,7 @@ long dbProcess(paddr)
|
||||
long options=0;
|
||||
long nRequest=1;
|
||||
|
||||
(status = dbGetLink(precord->sdis.value.db_link,precord,
|
||||
(status = dbGetLink(&precord->sdis.value.db_link,precord,
|
||||
DBR_SHORT,(caddr_t)(&(precord->disa)),&options,&nRequest));
|
||||
if(!RTN_SUCCESS(status)) {
|
||||
recGblDbaddrError(status,paddr,"dbProcess");
|
||||
@@ -247,7 +246,10 @@ long dbProcess(paddr)
|
||||
}
|
||||
}
|
||||
/* if disabled just return success */
|
||||
if(precord->disa == precord->disv) return(0);
|
||||
if(precord->disa == precord->disv) {
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* locate record processing routine */
|
||||
if(!(prset=GET_PRSET(paddr->record_type)) || !(prset->process)) {
|
||||
@@ -258,6 +260,8 @@ long dbProcess(paddr)
|
||||
|
||||
/* process record */
|
||||
status = (*prset->process)(paddr);
|
||||
|
||||
|
||||
return(status);
|
||||
|
||||
}
|
||||
|
||||
@@ -399,6 +399,7 @@ periodicScanTask()
|
||||
plist->scan_index = 0;
|
||||
plist->pscan = plist->psets[0];
|
||||
disableListScan[list] = TRUE;
|
||||
break;
|
||||
}else if (plist->index >= NUM_RECS_PER_SET){
|
||||
plist->index = 0;
|
||||
plist->set++;
|
||||
@@ -1060,7 +1061,7 @@ short list_index;
|
||||
/* adjust the list information */
|
||||
lists[list_index].num_records++;
|
||||
lists[list_index].num_scan =
|
||||
(lists[list_index].num_records / periods_to_complete[list_index]) + 1;
|
||||
((lists[list_index].num_records - 1) / periods_to_complete[list_index]) + 1;
|
||||
lists[list_index].pscan = lists[list_index].psets[0];
|
||||
lists[list_index].scan_index = 0;
|
||||
lists[list_index].index = 0;
|
||||
|
||||
732
src/db/dbTest.c
732
src/db/dbTest.c
File diff suppressed because it is too large
Load Diff
@@ -134,7 +134,7 @@ static void myCallback(pcallback)
|
||||
struct boRecord *pbo = (struct boRecord *)(pcallback->dbAddr.precord);
|
||||
|
||||
dbScanLock(pbo);
|
||||
pbo->val = 1;
|
||||
pbo->val = 0;
|
||||
(void)process(&(pcallback->dbAddr));
|
||||
dbScanUnlock(pbo);
|
||||
}
|
||||
|
||||
@@ -267,7 +267,7 @@ static void alarm(pmbbi)
|
||||
unsigned short *severities;
|
||||
short val=pmbbi->val;
|
||||
|
||||
if(val = pmbbi->lalm) return;
|
||||
if(val == pmbbi->lalm) return;
|
||||
pmbbi->lalm = val;
|
||||
|
||||
/* check for state alarm */
|
||||
|
||||
@@ -305,7 +305,7 @@ static void alarm(pmbbo)
|
||||
unsigned short *severities;
|
||||
short val=pmbbo->val;
|
||||
|
||||
if(val = pmbbo->lalm) return;
|
||||
if(val == pmbbo->lalm) return;
|
||||
pmbbo->lalm = val;
|
||||
|
||||
/* check for state alarm */
|
||||
|
||||
Reference in New Issue
Block a user