Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-01 16:42:34 +02:00
Code Issues Projects Releases Wiki Activity

2016-04-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Renamed the 'ClockAddress' parameter to 'HostAddress' in
	'rlm/rlm_walltime.c'.
This commit is contained in:
Fred Gleason 2016-04-23 12:33:13 -04:00
parent 065ebc15e2
commit 1d32d1d120
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15072,3 +15072,6 @@
'acinclude.m4'. 'acinclude.m4'.
2016-04-17 Fred Gleason <fredg@paravelsystems.com> 2016-04-17 Fred Gleason <fredg@paravelsystems.com>
* Added an 'rlm_walltime' RLM in 'rlm/rlm_walltime.c'. * Added an 'rlm_walltime' RLM in 'rlm/rlm_walltime.c'.
2016-04-23 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'ClockAddress' parameter to 'HostAddress' in
'rlm/rlm_walltime.c'.

6
conf/rlm_walltime.conf
View File

@ -16,7 +16,7 @@
; IP Address ; IP Address
; ;
; The IP address of the remote UDP port, in dotted-quad notation. ; The IP address of the Walltime clock, in dotted-quad notation.
IpAddress=192.168.21.100 IpAddress=192.168.21.100
; UDP Port ; UDP Port
@ -33,11 +33,11 @@ UdpPort=6060
; ;
FormatString=<body bgcolor="#000000"><table cellspacing="2" cellpadding="2" border="0"><tr><td>&nbsp;</td></tr><tr><td>&nbsp;</td></tr><tr><td><font size="6" color="white">%t</font>></td></tr><tr><td>&nbsp;</td></tr><tr><td><font size="5" color="red">%a</font><td></tr></table></body> FormatString=<body bgcolor="#000000"><table cellspacing="2" cellpadding="2" border="0"><tr><td>&nbsp;</td></tr><tr><td>&nbsp;</td></tr><tr><td><font size="6" color="white">%t</font>></td></tr><tr><td>&nbsp;</td></tr><tr><td><font size="5" color="red">%a</font><td></tr></table></body>
; Clock Address. ; Host Address.
; ;
; The IP address of the Walltime clock unit. ; The IP address of the Walltime clock unit.
; ;
ClockAddress=192.168.21.123 HostAddress=192.168.21.21
; Log Selection ; Log Selection
; ;

23
rlm/rlm_walltime.c
View File

@ -34,7 +34,7 @@ int rlm_walltime_devs;
char *rlm_walltime_addresses; char *rlm_walltime_addresses;
uint16_t *rlm_walltime_ports; uint16_t *rlm_walltime_ports;
char *rlm_walltime_formats; char *rlm_walltime_formats;
char *rlm_walltime_clock_addresses; char *rlm_walltime_host_addresses;
int *rlm_walltime_masters; int *rlm_walltime_masters;
int *rlm_walltime_aux1s; int *rlm_walltime_aux1s;
int *rlm_walltime_aux2s; int *rlm_walltime_aux2s;
@ -79,7 +79,7 @@ void rlm_walltime_RLMStart(void *ptr,const char *arg)
rlm_walltime_addresses=NULL; rlm_walltime_addresses=NULL;
rlm_walltime_ports=NULL; rlm_walltime_ports=NULL;
rlm_walltime_formats=NULL; rlm_walltime_formats=NULL;
rlm_walltime_clock_addresses=NULL; rlm_walltime_host_addresses=NULL;
rlm_walltime_masters=NULL; rlm_walltime_masters=NULL;
rlm_walltime_aux1s=NULL; rlm_walltime_aux1s=NULL;
rlm_walltime_aux2s=NULL; rlm_walltime_aux2s=NULL;
@ -100,15 +100,10 @@ void rlm_walltime_RLMStart(void *ptr,const char *arg)
rlm_walltime_formats=realloc(rlm_walltime_formats,(rlm_walltime_devs+1)*8192); rlm_walltime_formats=realloc(rlm_walltime_formats,(rlm_walltime_devs+1)*8192);
strncpy(rlm_walltime_formats+8192*rlm_walltime_devs, strncpy(rlm_walltime_formats+8192*rlm_walltime_devs,
RLMGetStringValue(ptr,arg,section,"FormatString",""),8192); RLMGetStringValue(ptr,arg,section,"FormatString",""),8192);
rlm_walltime_host_addresses=
realloc(rlm_walltime_host_addresses,(rlm_walltime_devs+1)*(rlm_walltime_devs+1)*16);
rlm_walltime_clock_addresses= strncpy(rlm_walltime_host_addresses+16*rlm_walltime_devs,
realloc(rlm_walltime_clock_addresses,(rlm_walltime_devs+1)*(rlm_walltime_devs+1)*16); RLMGetStringValue(ptr,arg,section,"HostAddress",""),15);
strncpy(rlm_walltime_clock_addresses+16*rlm_walltime_devs,
RLMGetStringValue(ptr,arg,section,"ClockAddress",""),15);
rlm_walltime_masters=realloc(rlm_walltime_masters, rlm_walltime_masters=realloc(rlm_walltime_masters,
(rlm_walltime_devs+1)*sizeof(int)); (rlm_walltime_devs+1)*sizeof(int));
rlm_walltime_masters[rlm_walltime_devs]= rlm_walltime_masters[rlm_walltime_devs]=
@ -137,7 +132,7 @@ void rlm_walltime_RLMFree(void *ptr)
free(rlm_walltime_addresses); free(rlm_walltime_addresses);
free(rlm_walltime_ports); free(rlm_walltime_ports);
free(rlm_walltime_formats); free(rlm_walltime_formats);
free(rlm_walltime_clock_addresses); free(rlm_walltime_host_addresses);
free(rlm_walltime_masters); free(rlm_walltime_masters);
free(rlm_walltime_aux1s); free(rlm_walltime_aux1s);
free(rlm_walltime_aux2s); free(rlm_walltime_aux2s);
@ -173,14 +168,14 @@ void rlm_walltime_RLMPadDataSent(void *ptr,const struct rlm_svc *svc,
if(now->rlm_len==0) { if(now->rlm_len==0) {
snprintf(timer,1500, snprintf(timer,1500,
"SP!RS!WU http://%s/walltime/walltime.html!", "SP!RS!WU http://%s/walltime/walltime.html!",
rlm_walltime_clock_addresses+16*i); rlm_walltime_host_addresses+16*i);
fprintf(f,"<body bgcolor=\"#000000\">&nbsp;</body>"); fprintf(f,"<body bgcolor=\"#000000\">&nbsp;</body>");
} }
else { else {
snprintf(timer,1500, snprintf(timer,1500,
"SM D!PS %d!ST!WU http://%s/walltime/walltime.html!", "SM D!PS %d!ST!WU http://%s/walltime/walltime.html!",
now->rlm_len/1000, now->rlm_len/1000,
rlm_walltime_clock_addresses+16*i); rlm_walltime_host_addresses+16*i);
fprintf(f,"%s\n", fprintf(f,"%s\n",
RLMResolveNowNextEncoded(ptr,now,next,rlm_walltime_formats+8192*i, RLMResolveNowNextEncoded(ptr,now,next,rlm_walltime_formats+8192*i,
RLM_ENCODE_XML)); RLM_ENCODE_XML));