Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-16 00:00:02 +01:00
Code Issues Releases Wiki Activity

renamed realtime_init() to init_realtime()

Browse source 
renamed resolve() to resolve_addr()

git-svn-id: https://zerberus.eonerc.rwth-aachen.de:8443/svn/s2ss/trunk@55 8ec27952-4edc-4aab-86aa-e87bb2611832
This commit is contained in:
Steffen Vogel 2014-06-05 09:35:33 +00:00
parent 9682a53a2c
commit 541d27a896
7 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/utils.h
View file

@ -41,7 +41,7 @@ void print(enum log_level lvl, const char *fmt, ...);
* - 0 on success
* - otherwise an error occured
*/
int resolve(const char *addr, struct sockaddr_in *sa, int flags);
int resolve_addr(const char *addr, struct sockaddr_in *sa, int flags);
/** Setup various realtime related things.
*
@ -53,7 +53,7 @@ int resolve(const char *addr, struct sockaddr_in *sa, int flags);
*
* @param g The global configuration
*/
void realtime_init(struct config *g);
void init_realtime(struct config *g);
/// Check assertion and exit if failed.
#define assert(exp) do { \

5
src/cfg.c
View file

@ -159,10 +159,10 @@ int config_parse_node(config_setting_t *c, struct config *g)
info("Loading %s node '%s'", type_str, name);
if (resolve(local_str, &local, 0))
if (resolve_addr(local_str, &local, 0))
cerror(c, "Failed to resolve local address '%s' of node '%s'", local_str, name);
if (resolve(remote_str, &remote, 0))
if (resolve_addr(remote_str, &remote, 0))
cerror(c, "Failed to resolve remote address '%s' of node '%s'", remote_str, name);
if (node_create(&g->nodes[g->node_count], name, type, local, remote))
@ -170,4 +170,3 @@ int config_parse_node(config_setting_t *c, struct config *g)
g->node_count++;
}

2
src/receive.c
View file

@ -56,7 +56,7 @@ int main(int argc, char *argv[])
struct sockaddr_in local;
struct sockaddr_in remote;
if (resolve(local_str, &local, 0))
if (resolve_addr(local_str, &local, 0))
error("Failed to resolve remote address: %s", local_str);
/* Print header */

4
src/send.c
View file

@ -60,7 +60,7 @@ int main(int argc, char *argv[])
struct sockaddr_in local;
struct sockaddr_in remote;
if (argc == 4 && resolve(remote_str, &remote, 0))
if (argc == 4 && resolve_addr(remote_str, &remote, 0))
error("Failed to resolve local address: %s", local_str);
else {
local.sin_family = AF_INET;
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
local.sin_port = 0;
}
if (resolve(remote_str, &remote, 0))
if (resolve_addr(remote_str, &remote, 0))
error("Failed to resolve remote address: %s", remote_str);
/* Create node */

4
src/server.c
View file

@ -100,14 +100,14 @@ int main(int argc, char *argv[])
config_init(&config.obj);
config_parse(&config.obj, &config);
/* Setup various realtime related things */
realtime_init(&config);
if (config.path_count)
info("Parsed %u nodes and %u paths", config.node_count, config.path_count);
else
error("No paths found. Terminating...");
/* Setup various realtime related things */
init_realtime(&config);
/* Start and connect all paths/nodes */
start();

4
src/test.c
View file

@ -54,7 +54,7 @@ int main(int argc, char *argv[])
struct sockaddr_in remote;
struct sockaddr_in local;
if (argc == 4 && resolve(remote_str, &remote, 0))
if (resolve_addr(local_str, &local, 0))
error("Failed to resolve local address: %s", local_str);
else {
local.sin_family = AF_INET;
@ -62,7 +62,7 @@ int main(int argc, char *argv[])
local.sin_port = 0;
}
if (resolve(remote_str, &remote, 0))
if (resolve_addr(remote_str, &remote, 0))
error("Failed to resolve remote address: %s", remote_str);
/* Create node */

6
src/utils.c
View file

@ -48,7 +48,7 @@ void print(enum log_level lvl, const char *fmt, ...)
va_end(ap);
}
int resolve(const char *addr, struct sockaddr_in *sa, int flags)
int resolve_addr(const char *addr, struct sockaddr_in *sa, int flags)
{
int ret;
char *node;
@ -90,7 +90,7 @@ int resolve(const char *addr, struct sockaddr_in *sa, int flags)
return 0;
}
void realtime_init(struct config *g)
void init_realtime(struct config *g)
{
/* Prefault stack */
char dummy[MAX_SAFE_STACK];
@ -108,7 +108,7 @@ void realtime_init(struct config *g)
if (stat("/sys/kernel/realtime", &st))
warn("This is not a a realtime patched kernel!");
else
debug(3 ,"This is a realtime patched kernel");
debug(3, "This is a realtime patched kernel");
/* Use FIFO scheduler with realtime priority */
struct sched_param param;