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

Merge 3.14 branch into 3.15

Browse Source
This commit is contained in:
Andrew Johnson
2017-06-01 16:40:33 -05:00
parent 29c069db3d 9c859ffdca
commit 1293747cf3
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ioc/rsrv/caservertask.c
View File

@@ -470,7 +470,6 @@ int rsrv_init (void)
clientQlock = epicsMutexMustCreate();
ellInit ( &clientQ );
freeListInitPvt ( &rsrvClientFreeList, sizeof(struct client), 8 );
freeListInitPvt ( &rsrvChanFreeList, sizeof(struct channel_in_use), 512 );
freeListInitPvt ( &rsrvEventFreeList, sizeof(struct event_ext), 512 );

5
src/ioc/rsrv/server.h
View File

@@ -167,7 +167,7 @@ enum ctl {ctlInit, ctlRun, ctlPause, ctlExit};
/* NOTE: external used so they remember the state across loads */
#ifdef GLBLSOURCE
# define GLBLTYPE
# define GLBLTYPE_INIT(A)
# define GLBLTYPE_INIT(A) = A
#else
# define GLBLTYPE extern
# define GLBLTYPE_INIT(A)
@@ -185,8 +185,7 @@ enum ctl {ctlInit, ctlRun, ctlPause, ctlExit};
GLBLTYPE int CASDEBUG;
GLBLTYPE unsigned short ca_server_port, ca_udp_port, ca_beacon_port;
GLBLTYPE ELLLIST clientQ; /* (TCP clients) locked by clientQlock */
GLBLTYPE ELLLIST clientQudp; /* locked by clientQlock */
GLBLTYPE ELLLIST clientQ GLBLTYPE_INIT(ELLLIST_INIT);
GLBLTYPE ELLLIST servers; /* rsrv_iface_config::node, read-only after rsrv_init() */
GLBLTYPE ELLLIST beaconAddrList;
GLBLTYPE SOCKET beaconSocket;