From 4701ce26028390e0713963633e32af3dc34b8433 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 28 Jun 2014 20:17:30 +0000 Subject: [PATCH] restructure repo: server git-svn-id: https://zerberus.eonerc.rwth-aachen.de:8443/svn/s2ss/trunk@101 8ec27952-4edc-4aab-86aa-e87bb2611832 --- .gitignore | 10 ---------- server/.gitignore | 3 +++ Makefile => server/Makefile | 0 {etc => server/etc}/example.conf | 2 +- {etc => server/etc}/loopback.conf | 4 ++-- {include => server/include}/cfg.h | 0 {include => server/include}/config.h | 0 {include => server/include}/if.h | 0 {include => server/include}/msg.h | 0 {include => server/include}/node.h | 0 {include => server/include}/path.h | 2 +- {include => server/include}/tc.h | 0 {include => server/include}/utils.h | 0 {src => server/src}/cfg.c | 0 {src => server/src}/if.c | 0 {src => server/src}/msg.c | 0 {src => server/src}/node.c | 0 {src => server/src}/path.c | 0 {src => server/src}/random.c | 0 {src => server/src}/receive.c | 0 {src => server/src}/send.c | 0 {src => server/src}/server.c | 0 {src => server/src}/tc.c | 0 {src => server/src}/test.c | 0 {src => server/src}/utils.c | 0 25 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 .gitignore create mode 100644 server/.gitignore rename Makefile => server/Makefile (100%) rename {etc => server/etc}/example.conf (95%) rename {etc => server/etc}/loopback.conf (91%) rename {include => server/include}/cfg.h (100%) rename {include => server/include}/config.h (100%) rename {include => server/include}/if.h (100%) rename {include => server/include}/msg.h (100%) rename {include => server/include}/node.h (100%) rename {include => server/include}/path.h (99%) rename {include => server/include}/tc.h (100%) rename {include => server/include}/utils.h (100%) rename {src => server/src}/cfg.c (100%) rename {src => server/src}/if.c (100%) rename {src => server/src}/msg.c (100%) rename {src => server/src}/node.c (100%) rename {src => server/src}/path.c (100%) rename {src => server/src}/random.c (100%) rename {src => server/src}/receive.c (100%) rename {src => server/src}/send.c (100%) rename {src => server/src}/server.c (100%) rename {src => server/src}/tc.c (100%) rename {src => server/src}/test.c (100%) rename {src => server/src}/utils.c (100%) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f13814c7b..000000000 --- a/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ - -*.d -*.o -*~ - -server -test -random -send -receive diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 000000000..9f8b81467 --- /dev/null +++ b/server/.gitignore @@ -0,0 +1,3 @@ +*.d +*.o +*~ diff --git a/Makefile b/server/Makefile similarity index 100% rename from Makefile rename to server/Makefile diff --git a/etc/example.conf b/server/etc/example.conf similarity index 95% rename from etc/example.conf rename to server/etc/example.conf index 20ccc268f..2b775537c 100644 --- a/etc/example.conf +++ b/server/etc/example.conf @@ -5,7 +5,7 @@ name = "s2ss"; # The name of this node affinity = 0x02; # Mask of cores the server should run on priority = 50; # Scheduler priority for the server -user = "acs-admin"; # Drop privileges after initialization +user = "acs-admin"; # Drop privileges after initialization group = "acs-admin"; nodes = { diff --git a/etc/loopback.conf b/server/etc/loopback.conf similarity index 91% rename from etc/loopback.conf rename to server/etc/loopback.conf index 7f5c615cb..1e8da4c47 100644 --- a/etc/loopback.conf +++ b/server/etc/loopback.conf @@ -11,7 +11,7 @@ nodes = { type = "opal", # server, workstation, opal, rtds or dsp local = "127.0.0.1:10201", # Local ip:port, use '*' for random port remote = "127.0.0.1:10200" - }, + } }; paths = ( @@ -19,6 +19,6 @@ paths = ( enabled = true, # Enable this path reverse = false, # Setup a path in the reverse direction too in = "node", # Name of the node we listen to (see above) - out = "node", # And we loop back to the origin + out = "node" # And we loop back to the origin } ); diff --git a/include/cfg.h b/server/include/cfg.h similarity index 100% rename from include/cfg.h rename to server/include/cfg.h diff --git a/include/config.h b/server/include/config.h similarity index 100% rename from include/config.h rename to server/include/config.h diff --git a/include/if.h b/server/include/if.h similarity index 100% rename from include/if.h rename to server/include/if.h diff --git a/include/msg.h b/server/include/msg.h similarity index 100% rename from include/msg.h rename to server/include/msg.h diff --git a/include/node.h b/server/include/node.h similarity index 100% rename from include/node.h rename to server/include/node.h diff --git a/include/path.h b/server/include/path.h similarity index 99% rename from include/path.h rename to server/include/path.h index 8eb2d0041..d711b178e 100644 --- a/include/path.h +++ b/server/include/path.h @@ -53,7 +53,7 @@ struct path /** The thread id for this path */ pthread_t tid; /** A second thread id for fixed rate sending thread */ - phtread_t tid2; + pthread_t tid2; /** A pointer to the libconfig object which instantiated this path */ config_setting_t *cfg; diff --git a/include/tc.h b/server/include/tc.h similarity index 100% rename from include/tc.h rename to server/include/tc.h diff --git a/include/utils.h b/server/include/utils.h similarity index 100% rename from include/utils.h rename to server/include/utils.h diff --git a/src/cfg.c b/server/src/cfg.c similarity index 100% rename from src/cfg.c rename to server/src/cfg.c diff --git a/src/if.c b/server/src/if.c similarity index 100% rename from src/if.c rename to server/src/if.c diff --git a/src/msg.c b/server/src/msg.c similarity index 100% rename from src/msg.c rename to server/src/msg.c diff --git a/src/node.c b/server/src/node.c similarity index 100% rename from src/node.c rename to server/src/node.c diff --git a/src/path.c b/server/src/path.c similarity index 100% rename from src/path.c rename to server/src/path.c diff --git a/src/random.c b/server/src/random.c similarity index 100% rename from src/random.c rename to server/src/random.c diff --git a/src/receive.c b/server/src/receive.c similarity index 100% rename from src/receive.c rename to server/src/receive.c diff --git a/src/send.c b/server/src/send.c similarity index 100% rename from src/send.c rename to server/src/send.c diff --git a/src/server.c b/server/src/server.c similarity index 100% rename from src/server.c rename to server/src/server.c diff --git a/src/tc.c b/server/src/tc.c similarity index 100% rename from src/tc.c rename to server/src/tc.c diff --git a/src/test.c b/server/src/test.c similarity index 100% rename from src/test.c rename to server/src/test.c diff --git a/src/utils.c b/server/src/utils.c similarity index 100% rename from src/utils.c rename to server/src/utils.c