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

better messages

Browse Source
This commit is contained in:
Jeff Hill
1992-07-27 15:04:48 +00:00
parent a703ec1e81
commit d9d931ccfd
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ca/service.c
View File

@@ -39,6 +39,7 @@
/* 042892 joh No longer checking the status from free() */
/* since it varies from os to os */
/* 040592 joh took out extra cac_send_msg() calls */
/* 072792 joh better messages */
/* */
/*_begin */
/************************************************************************/
@@ -89,7 +90,7 @@ void reconnect_channel();
void ca_request_event();
int client_channel_exists();
#define BUFSTAT ca_printf("expected %d left %d\n",msgcnt,*pbufcnt);
#define BUFSTAT ca_printf("CAC: expected %d left %d\n",msgcnt,*pbufcnt);
@@ -122,7 +123,7 @@ post_msg(hdrptr, pbufcnt, pnet_addr, piiu)
while (*pbufcnt >= sizeof(*hdrptr)) {
#ifdef DEBUG
ca_printf("bytes left %d, pending msgcnt %d\n",
ca_printf("CAC: bytes left %d, pending msgcnt %d\n",
*pbufcnt,
pndrecvcnt);
#endif
@@ -135,7 +136,7 @@ post_msg(hdrptr, pbufcnt, pnet_addr, piiu)
t_count = ntohs(hdrptr->m_count);
#ifdef DEBUG
ca_printf("MSG: cmd:%d type:%d cnt:%d npost:%d avail:%x\n",
ca_printf("CAC: MSG=> cmd:%d type:%d cnt:%d npost:%d avail:%x\n",
t_cmmd,
t_type,
t_count,
@@ -410,7 +411,7 @@ post_msg(hdrptr, pbufcnt, pnet_addr, piiu)
case REPEATER_CONFIRM:
ca_static->ca_repeater_contacted = TRUE;
#ifdef DEBUG
ca_printf("repeater confirmation recv\n");
ca_printf("CAC: repeater confirmation recv\n");
#endif
break;
@@ -540,7 +541,7 @@ post_msg(hdrptr, pbufcnt, pnet_addr, piiu)
break;
}
default:
ca_printf("post_msg(): Corrupt cmd in msg %x\n",
ca_printf("CAC: post_msg(): Corrupt cmd in msg %x\n",
t_cmmd);
*pbufcnt = 0;
@@ -584,9 +585,9 @@ struct in_addr *pnet_addr;
&newiocix
);
if(status != ECA_NORMAL){
ca_printf("... %s ...\n", ca_message(status));
ca_printf("for %s on %s\n", chan+1, host_from_addr(pnet_addr));
ca_printf("ignored search reply- proceeding\n");
ca_printf("CAC: ... %s ...\n", ca_message(status));
ca_printf("CAC: for %s on %s\n", chan+1, host_from_addr(pnet_addr));
ca_printf("CAC: ignored search reply- proceeding\n");
return;
}

35
src/ca/test_event.c
View File

@@ -6,7 +6,8 @@
*
*
* History
* joh 031891 printed type in decimanl instead of hex
* joh 031891 printed type in decimal instead of hex
* joh 072792 better messages
*
*
*
@@ -23,50 +24,50 @@ void
ca_test_event(args)
struct event_handler_args args;
{
ca_printf("~~~### in test event for [%s] ###~~~\n",args.chid+1);
ca_printf("User argument\t%x\n", args.usr);
ca_printf("Native channel data type\t%d\n", args.chid->type);
ca_printf("Monitor data type\t%d\n", args.type);
ca_printf("CAC: ~~~### in test event for [%s] ###~~~\n",args.chid+1);
ca_printf("CAC: User argument\t%x\n", args.usr);
ca_printf("CAC: Native channel data type\t%d\n", args.chid->type);
ca_printf("CAC: Monitor data type\t%d\n", args.type);
switch(args.type){
case DBR_STRING:
ca_printf("Value:\t<%s>\n",args.dbr);
ca_printf("CAC: Value:\t<%s>\n",args.dbr);
break;
case DBR_CHAR:
ca_printf("Value:\t<%d>\n",*(char *)args.dbr);
ca_printf("CAC: Value:\t<%d>\n",*(char *)args.dbr);
break;
#if DBR_INT != DBR_SHORT
case DBR_INT:
#endif
case DBR_SHORT:
case DBR_ENUM:
ca_printf("Value:\t<%d>\n",*(short *)args.dbr);
ca_printf("CAC: Value:\t<%d>\n",*(short *)args.dbr);
break;
case DBR_LONG:
ca_printf("Value:\t<%d>\n",*(long *)args.dbr);
ca_printf("CAC: Value:\t<%d>\n",*(long *)args.dbr);
break;
case DBR_FLOAT:
ca_printf("Value:\t<%f>\n",*(float *)args.dbr);
ca_printf("CAC: Value:\t<%f>\n",*(float *)args.dbr);
break;
case DBR_DOUBLE:
ca_printf("Value:\t<%f>\n",*(double *)args.dbr);
ca_printf("CAC: Value:\t<%f>\n",*(double *)args.dbr);
break;
case DBR_STS_STRING:
ca_printf("Value:\t<%s>\n",((struct dbr_sts_string *)args.dbr)->value);
ca_printf("CAC: Value:\t<%s>\n",((struct dbr_sts_string *)args.dbr)->value);
break;
case DBR_STS_INT:
ca_printf("Value:\t<%d>\n",((struct dbr_sts_int *)args.dbr)->value);
ca_printf("CAC: Value:\t<%d>\n",((struct dbr_sts_int *)args.dbr)->value);
break;
case DBR_STS_FLOAT:
ca_printf("Value:\t<%f>\n",((struct dbr_sts_float *)args.dbr)->value);
ca_printf("CAC: Value:\t<%f>\n",((struct dbr_sts_float *)args.dbr)->value);
break;
case DBR_STS_ENUM:
ca_printf("Value:\t<%d>\n",((struct dbr_sts_enum *)args.dbr)->value);
ca_printf("CAC: Value:\t<%d>\n",((struct dbr_sts_enum *)args.dbr)->value);
break;
case DBR_GR_FLOAT:
ca_printf("Value:\t<%f>\n",((struct dbr_gr_float *)args.dbr)->value);
ca_printf("CAC: Value:\t<%f>\n",((struct dbr_gr_float *)args.dbr)->value);
break;
default:
ca_printf( "Sorry test_event does not handle data type %d yet\n",
ca_printf( "CAC: Sorry test_event does not handle data type %d yet\n",
args.type);
}
}