diff -urN rt_v31/rt.c rt_v32/rt.c --- rt_v31/rt.c 2018-05-02 00:59:34.000000000 +0900 +++ rt_v32/rt.c 2018-05-06 21:09:49.000000000 +0900 @@ -36,7 +36,7 @@ map_col(int idx, struct line *l_nv_g, int rev, double sec, int *ret_col) { struct data_one *d = data_one_get(idx); - int sz, i, fn; + int i, fn; int sum_col[3] = {-1,-1,-1}; if(d->maps.n <= 0){ @@ -47,7 +47,6 @@ for(i=0; imaps.n; i++){ struct map *m = &d->maps.lst[i]; struct line nv_line; - int fd; double p[3], x, y; int no_col[3] = {-1,-1,-1}, col[3]; @@ -346,14 +345,19 @@ int main(int ac, char **av) { - int port = SOCK_PORT + 13; void *funcs[] = { srv_map_col, srv_calc_diff, srv_get_col, }; - if(ac >= 2 && strcmp(av[1], "boot") == 0){ + if(arg_is(ac, av, 1, "boot")){ + char *name = arg_s(ac, av, "name", "srv.rt"); + char *buf = get_prop(name, NULL), *bp = buf; + int port; + + bp = COPY_FROM_BP(bp, port); + free(buf); sock_srv_main_loop(port, sizeof(funcs)/sizeof(*funcs), funcs); } return 0; diff -urN rt_v31/rt.py rt_v32/rt.py --- rt_v31/rt.py 2018-05-06 16:45:43.000000000 +0900 +++ rt_v32/rt.py 2018-05-06 21:28:39.000000000 +0900 @@ -194,12 +194,17 @@ new_client = lambda name: sock.new_client(name, cmd_infs) -names = [ 'srv.rt', 'srv.rt-2' ] +names = [ 'srv.rt', 'srv.rt-14', 'srv.rt-15', 'srv.rt-16', 'srv.rt-17', 'srv.rt-18' ] +names = names[:2] + +#names = [ 'srv.rt', 'srv.rt-2' ] #names = [ 'srv.rt' ] + clis = list( map( new_client, names ) ) if __name__ == "__main__": if ut.arg_is(1, 'boot'): - sock.server('srv.rt', cmd_infs) + name = ut.arg_s('name', 'srv.rt') + sock.server(name, cmd_infs) sys.exit(0) # EOF diff -urN rt_v31/srvs.py rt_v32/srvs.py --- rt_v31/srvs.py 2018-05-06 13:51:38.000000000 +0900 +++ rt_v32/srvs.py 2018-05-06 21:14:59.000000000 +0900 @@ -10,9 +10,14 @@ ( 'srv.val', { 'port': base_port + 11, 'cmd': './val.py boot', 'pid': -1 } ), ( 'srv.img', { 'port': base_port + 12, 'cmd': './img.py boot', 'pid': -1 } ), ( 'srv.rt', { 'port': base_port + 13, 'cmd': './rt boot', 'pid': -1 } ), - ( 'srv.cross', { 'port': base_port + 14, 'cmd': './cross boot', 'pid': -1 } ), - ( 'srv.rt-2', { 'port': base_port + 23, 'cmd': 'echo "cd rt_v31 ; ./rt boot" | nc localhost {}'.format(base_port + 20), 'pid': -1 } ), + ( 'srv.rt-14', { 'port': base_port + 14, 'cmd': './rt boot name=srv.rt-14', 'pid': -1 } ), + ( 'srv.rt-15', { 'port': base_port + 15, 'cmd': './rt boot name=srv.rt-15', 'pid': -1 } ), + ( 'srv.rt-16', { 'port': base_port + 16, 'cmd': './rt boot name=srv.rt-16', 'pid': -1 } ), + ( 'srv.rt-17', { 'port': base_port + 17, 'cmd': './rt boot name=srv.rt-17', 'pid': -1 } ), + ( 'srv.rt-18', { 'port': base_port + 18, 'cmd': './rt boot name=srv.rt-18', 'pid': -1 } ), + + ( 'srv.rt-2', { 'port': base_port + 23, 'cmd': 'echo "cd rt_v32 ; ./rt boot" | nc localhost {}'.format(base_port + 20), 'pid': -1 } ), ] infd = dict(infs) diff -urN rt_v31/ut.c rt_v32/ut.c --- rt_v31/ut.c 2018-04-29 22:55:29.000000000 +0900 +++ rt_v32/ut.c 2018-05-06 20:40:22.000000000 +0900 @@ -14,4 +14,44 @@ } } +char * +arg_s(int ac, char **av, char *k, char *def_val) +{ + int kn = strlen(k), n, i; + + for(i=0; i