author | viric@mandarina |
Wed, 07 Oct 2009 21:20:12 +0200 | |
changeset 283 | f049b802be64 |
parent 278 | 1698b327528d |
child 285 | 0a105f193446 |
child 287 | b3c38ff8f41a |
permissions | -rw-r--r-- |
49 | 1 |
/* |
2 |
Task Spooler - a task queue system for the unix user |
|
267 | 3 |
Copyright (C) 2007-2009 LluĂs Batlle i Rossell |
49 | 4 |
|
5 |
Please find the license in the provided COPYING file. |
|
6 |
*/ |
|
1 | 7 |
#include <sys/types.h> |
8 |
#include <sys/socket.h> |
|
44 | 9 |
#include <sys/select.h> |
134
5a6b8bb1f7a8
Fixing two bugs noted in buglist.bug (ts clients not dying on removejob, queue
viric@llimona
parents:
129
diff
changeset
|
10 |
#ifdef linux |
5a6b8bb1f7a8
Fixing two bugs noted in buglist.bug (ts clients not dying on removejob, queue
viric@llimona
parents:
129
diff
changeset
|
11 |
#include <sys/time.h> |
5a6b8bb1f7a8
Fixing two bugs noted in buglist.bug (ts clients not dying on removejob, queue
viric@llimona
parents:
129
diff
changeset
|
12 |
#endif |
94 | 13 |
#include <sys/resource.h> |
1 | 14 |
#include <sys/un.h> |
15 |
#include <errno.h> |
|
3 | 16 |
#include <string.h> |
28
107abb4ec98a
Unified socket path, depending on the username and $TMPDIR.
viric@llimona
parents:
26
diff
changeset
|
17 |
#include <stdlib.h> |
44 | 18 |
#include <unistd.h> |
94 | 19 |
#include <limits.h> |
99
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
20 |
#include <signal.h> |
120 | 21 |
#include <fcntl.h> |
263 | 22 |
#include <libgen.h> |
1 | 23 |
|
24 |
#include <stdio.h> |
|
25 |
||
3 | 26 |
#include "main.h" |
1 | 27 |
|
28 |
enum |
|
29 |
{ |
|
64 | 30 |
MAXCONN=1000 |
1 | 31 |
}; |
32 |
||
33 |
enum Break |
|
34 |
{ |
|
2 | 35 |
BREAK, |
260
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
36 |
NOBREAK, |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
37 |
CLOSE |
1 | 38 |
}; |
39 |
||
3 | 40 |
/* Prototypes */ |
41 |
static void server_loop(int ls); |
|
42 |
static enum Break |
|
43 |
client_read(int index); |
|
44 |
static void end_server(int ls); |
|
8 | 45 |
static void s_newjob_ok(int index); |
218 | 46 |
static void s_runjob(int jobid, int index); |
260
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
47 |
static void clean_after_client_disappeared(int socket, int index); |
3 | 48 |
|
49 |
struct Client_conn |
|
50 |
{ |
|
51 |
int socket; |
|
52 |
int hasjob; |
|
53 |
int jobid; |
|
54 |
}; |
|
55 |
||
56 |
/* Globals */ |
|
57 |
static struct Client_conn client_cs[MAXCONN]; |
|
58 |
static int nconnections; |
|
28
107abb4ec98a
Unified socket path, depending on the username and $TMPDIR.
viric@llimona
parents:
26
diff
changeset
|
59 |
static char *path; |
94 | 60 |
static int max_descriptors; |
61 |
||
260
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
62 |
static void s_send_version(int s) |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
63 |
{ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
64 |
struct msg m; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
65 |
|
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
66 |
m.type = VERSION; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
67 |
m.u.version = PROTOCOL_VERSION; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
68 |
|
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
69 |
send_msg(s, &m); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
70 |
} |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
71 |
|
99
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
72 |
static void sigterm_handler(int n) |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
73 |
{ |
120 | 74 |
const char *dumpfilename; |
75 |
int fd; |
|
76 |
||
77 |
/* Dump the job list if we should to */ |
|
78 |
dumpfilename = getenv("TS_SAVELIST"); |
|
79 |
if (dumpfilename != NULL) |
|
80 |
{ |
|
81 |
fd = open(dumpfilename, O_WRONLY | O_APPEND | O_CREAT, 0600); |
|
82 |
if (fd != -1) |
|
83 |
{ |
|
84 |
joblist_dump(fd); |
|
85 |
close(fd); |
|
86 |
} else |
|
87 |
warning("The TS_SAVELIST file \"%s\" cannot be opened", |
|
88 |
dumpfilename); |
|
89 |
} |
|
90 |
||
99
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
91 |
/* path will be initialized for sure, before installing the handler */ |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
92 |
unlink(path); |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
93 |
exit(1); |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
94 |
} |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
95 |
|
239
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
96 |
static void set_default_maxslots() |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
97 |
{ |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
98 |
char *str; |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
99 |
|
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
100 |
str = getenv("TS_SLOTS"); |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
101 |
if (str != NULL) |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
102 |
{ |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
103 |
int slots; |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
104 |
slots = abs(atoi(str)); |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
105 |
s_set_max_slots(slots); |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
106 |
} |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
107 |
} |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
108 |
|
99
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
109 |
static void install_sigterm_handler() |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
110 |
{ |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
111 |
struct sigaction act; |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
112 |
|
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
113 |
act.sa_handler = sigterm_handler; |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
114 |
/* Reset the mask */ |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
115 |
memset(&act.sa_mask,0,sizeof(act.sa_mask)); |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
116 |
act.sa_flags = 0; |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
117 |
|
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
118 |
sigaction(SIGTERM, &act, NULL); |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
119 |
} |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
120 |
|
94 | 121 |
static int get_max_descriptors() |
122 |
{ |
|
123 |
const int MARGIN = 5; /* stdin, stderr, listen socket, and whatever */ |
|
124 |
int max; |
|
125 |
struct rlimit rlim; |
|
126 |
int res; |
|
278 | 127 |
const char *str; |
94 | 128 |
|
129 |
max = MAXCONN; |
|
278 | 130 |
|
131 |
str = getenv("TS_MAXCONN"); |
|
132 |
if (str != NULL) |
|
133 |
{ |
|
134 |
int user_maxconn; |
|
135 |
user_maxconn = abs(atoi(str)); |
|
136 |
if (max > user_maxconn) |
|
137 |
max = user_maxconn; |
|
138 |
} |
|
139 |
||
94 | 140 |
if (max > FD_SETSIZE) |
278 | 141 |
max = FD_SETSIZE - MARGIN; |
94 | 142 |
|
143 |
/* I'd like to use OPEN_MAX or NR_OPEN, but I don't know if any |
|
144 |
* of them is POSIX compliant */ |
|
145 |
||
146 |
res = getrlimit(RLIMIT_NOFILE, &rlim); |
|
147 |
if (res != 0) |
|
148 |
warning("getrlimit for open files"); |
|
149 |
else |
|
150 |
{ |
|
151 |
if (max > rlim.rlim_cur) |
|
278 | 152 |
max = rlim.rlim_cur - MARGIN; |
94 | 153 |
} |
154 |
||
278 | 155 |
if (max < 1) |
94 | 156 |
error("Too few opened descriptors available"); |
157 |
||
278 | 158 |
return max; |
94 | 159 |
} |
1 | 160 |
|
28
107abb4ec98a
Unified socket path, depending on the username and $TMPDIR.
viric@llimona
parents:
26
diff
changeset
|
161 |
void server_main(int notify_fd, char *_path) |
1 | 162 |
{ |
44 | 163 |
int ls; |
2 | 164 |
struct sockaddr_un addr; |
165 |
int res; |
|
263 | 166 |
char *dirpath; |
1 | 167 |
|
104 | 168 |
process_type = SERVER; |
94 | 169 |
max_descriptors = get_max_descriptors(); |
170 |
||
28
107abb4ec98a
Unified socket path, depending on the username and $TMPDIR.
viric@llimona
parents:
26
diff
changeset
|
171 |
path = _path; |
107abb4ec98a
Unified socket path, depending on the username and $TMPDIR.
viric@llimona
parents:
26
diff
changeset
|
172 |
|
263 | 173 |
/* Move the server to the socket directory */ |
174 |
dirpath = strdup(path); |
|
175 |
chdir(dirname(dirpath)); |
|
176 |
free(dirpath); |
|
177 |
||
3 | 178 |
nconnections = 0; |
179 |
||
129
312083fb8899
Change PF_UNIX to AF_UNIX. According to socket(2), this is better.
viric@llimona
parents:
120
diff
changeset
|
180 |
ls = socket(AF_UNIX, SOCK_STREAM, 0); |
92
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
181 |
if(ls == -1) |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
182 |
error("cannot create the listen socket in the server"); |
1 | 183 |
|
2 | 184 |
addr.sun_family = AF_UNIX; |
185 |
strcpy(addr.sun_path, path); |
|
1 | 186 |
|
2 | 187 |
res = bind(ls, (struct sockaddr *) &addr, sizeof(addr)); |
188 |
if (res == -1) |
|
92
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
189 |
error("Error binding."); |
1 | 190 |
|
2 | 191 |
res = listen(ls, 0); |
192 |
if (res == -1) |
|
92
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
193 |
error("Error listening."); |
1 | 194 |
|
99
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
195 |
install_sigterm_handler(); |
88d96be4e0e9
Never leave the socket if the server dies by SIGTERM.
viric@llimona
parents:
94
diff
changeset
|
196 |
|
239
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
197 |
set_default_maxslots(); |
18301d7a56d4
As asked by Sergio Ballestreros, adding TS_SLOTS to set the default amount of
viric@vicerveza
parents:
231
diff
changeset
|
198 |
|
25 | 199 |
notify_parent(notify_fd); |
200 |
||
2 | 201 |
server_loop(ls); |
1 | 202 |
} |
203 |
||
8 | 204 |
static int get_conn_of_jobid(int jobid) |
205 |
{ |
|
206 |
int i; |
|
207 |
for(i=0; i< nconnections; ++i) |
|
208 |
if (client_cs[i].hasjob && client_cs[i].jobid == jobid) |
|
209 |
return i; |
|
210 |
return -1; |
|
211 |
} |
|
212 |
||
3 | 213 |
static void server_loop(int ls) |
1 | 214 |
{ |
2 | 215 |
fd_set readset; |
216 |
int i; |
|
217 |
int maxfd; |
|
218 |
int keep_loop = 1; |
|
8 | 219 |
int newjob; |
1 | 220 |
|
2 | 221 |
while (keep_loop) |
222 |
{ |
|
223 |
FD_ZERO(&readset); |
|
94 | 224 |
maxfd = 0; |
225 |
/* If we can accept more connections, go on. |
|
226 |
* Otherwise, the system block them (no accept will be done). */ |
|
227 |
if (nconnections < max_descriptors) |
|
228 |
{ |
|
229 |
FD_SET(ls,&readset); |
|
230 |
maxfd = ls; |
|
231 |
} |
|
2 | 232 |
for(i=0; i< nconnections; ++i) |
233 |
{ |
|
3 | 234 |
FD_SET(client_cs[i].socket, &readset); |
235 |
if (client_cs[i].socket > maxfd) |
|
236 |
maxfd = client_cs[i].socket; |
|
2 | 237 |
} |
238 |
select(maxfd + 1, &readset, NULL, NULL, NULL); |
|
239 |
if (FD_ISSET(ls,&readset)) |
|
240 |
{ |
|
241 |
int cs; |
|
242 |
cs = accept(ls, NULL, NULL); |
|
92
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
243 |
if (cs == -1) |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
244 |
error("Accepting from %i", ls); |
134
5a6b8bb1f7a8
Fixing two bugs noted in buglist.bug (ts clients not dying on removejob, queue
viric@llimona
parents:
129
diff
changeset
|
245 |
client_cs[nconnections].hasjob = 0; |
5a6b8bb1f7a8
Fixing two bugs noted in buglist.bug (ts clients not dying on removejob, queue
viric@llimona
parents:
129
diff
changeset
|
246 |
client_cs[nconnections].socket = cs; |
5a6b8bb1f7a8
Fixing two bugs noted in buglist.bug (ts clients not dying on removejob, queue
viric@llimona
parents:
129
diff
changeset
|
247 |
++nconnections; |
2 | 248 |
} |
249 |
for(i=0; i< nconnections; ++i) |
|
3 | 250 |
if (FD_ISSET(client_cs[i].socket, &readset)) |
2 | 251 |
{ |
252 |
enum Break b; |
|
3 | 253 |
b = client_read(i); |
2 | 254 |
/* Check if we should break */ |
260
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
255 |
if (b == CLOSE) |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
256 |
{ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
257 |
warning("Closing"); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
258 |
/* On unknown message, we close the client, |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
259 |
or it may hang waiting for an answer */ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
260 |
clean_after_client_disappeared(client_cs[i].socket, i); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
261 |
} |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
262 |
else if (b == BREAK) |
2 | 263 |
keep_loop = 0; |
264 |
} |
|
19
5efc347cca8d
The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents:
18
diff
changeset
|
265 |
/* This will return firstjob->jobid or -1 */ |
8 | 266 |
newjob = next_run_job(); |
267 |
if (newjob != -1) |
|
268 |
{ |
|
269 |
int conn; |
|
270 |
conn = get_conn_of_jobid(newjob); |
|
19
5efc347cca8d
The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents:
18
diff
changeset
|
271 |
/* This next marks the firstjob state to RUNNING */ |
218 | 272 |
s_mark_job_running(newjob); |
273 |
s_runjob(newjob, conn); |
|
8 | 274 |
} |
2 | 275 |
} |
1 | 276 |
|
2 | 277 |
end_server(ls); |
1 | 278 |
} |
279 |
||
3 | 280 |
static void end_server(int ls) |
1 | 281 |
{ |
2 | 282 |
close(ls); |
283 |
unlink(path); |
|
28
107abb4ec98a
Unified socket path, depending on the username and $TMPDIR.
viric@llimona
parents:
26
diff
changeset
|
284 |
/* This comes from the parent, in the fork after server_main. |
107abb4ec98a
Unified socket path, depending on the username and $TMPDIR.
viric@llimona
parents:
26
diff
changeset
|
285 |
* This is the last use of path in this process.*/ |
107abb4ec98a
Unified socket path, depending on the username and $TMPDIR.
viric@llimona
parents:
26
diff
changeset
|
286 |
free(path); |
1 | 287 |
} |
288 |
||
3 | 289 |
static void remove_connection(int index) |
1 | 290 |
{ |
2 | 291 |
int i; |
3 | 292 |
|
293 |
if(client_cs[index].hasjob) |
|
2 | 294 |
{ |
3 | 295 |
s_removejob(client_cs[index].jobid); |
2 | 296 |
} |
3 | 297 |
|
298 |
for(i=index; i<(nconnections-1); ++i) |
|
299 |
{ |
|
300 |
memcpy(&client_cs[i], &client_cs[i+1], sizeof(client_cs[0])); |
|
301 |
} |
|
302 |
nconnections--; |
|
1 | 303 |
} |
304 |
||
252
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
305 |
static void |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
306 |
clean_after_client_disappeared(int socket, int index) |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
307 |
{ |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
308 |
/* Act as if the job ended. */ |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
309 |
int jobid = client_cs[index].jobid; |
256
638fcfee37c6
In 254 I introduced an important bug: ts -t marked the running job as
viric@mandarina
parents:
253
diff
changeset
|
310 |
if (client_cs[index].hasjob && job_is_running(jobid)) |
252
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
311 |
{ |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
312 |
struct Result r; |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
313 |
|
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
314 |
r.errorlevel = -1; |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
315 |
r.died_by_signal = 1; |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
316 |
r.signal = SIGKILL; |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
317 |
r.user_ms = 0; |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
318 |
r.system_ms = 0; |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
319 |
r.real_ms = 0; |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
320 |
r.skipped = 0; |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
321 |
|
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
322 |
warning("JobID %i quit while running.", jobid); |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
323 |
job_finished(&r, jobid); |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
324 |
/* For the dependencies */ |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
325 |
check_notify_list(jobid); |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
326 |
/* We don't want this connection to do anything |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
327 |
* more related to the jobid, secially on remove_connection |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
328 |
* when we receive the EOC. */ |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
329 |
client_cs[index].hasjob = 0; |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
330 |
} |
256
638fcfee37c6
In 254 I introduced an important bug: ts -t marked the running job as
viric@mandarina
parents:
253
diff
changeset
|
331 |
else |
638fcfee37c6
In 254 I introduced an important bug: ts -t marked the running job as
viric@mandarina
parents:
253
diff
changeset
|
332 |
/* If it doesn't have a running job, |
638fcfee37c6
In 254 I introduced an important bug: ts -t marked the running job as
viric@mandarina
parents:
253
diff
changeset
|
333 |
* it may well be a notification */ |
638fcfee37c6
In 254 I introduced an important bug: ts -t marked the running job as
viric@mandarina
parents:
253
diff
changeset
|
334 |
s_remove_notification(socket); |
252
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
335 |
|
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
336 |
close(socket); |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
337 |
remove_connection(index); |
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
338 |
} |
3 | 339 |
|
340 |
static enum Break |
|
341 |
client_read(int index) |
|
1 | 342 |
{ |
3 | 343 |
struct msg m; |
2 | 344 |
int s; |
345 |
int res; |
|
1 | 346 |
|
3 | 347 |
s = client_cs[index].socket; |
1 | 348 |
|
2 | 349 |
/* Read the message */ |
92
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
350 |
res = recv_msg(s, &m); |
8 | 351 |
if (res == -1) |
352 |
{ |
|
134
5a6b8bb1f7a8
Fixing two bugs noted in buglist.bug (ts clients not dying on removejob, queue
viric@llimona
parents:
129
diff
changeset
|
353 |
warning("client recv failed"); |
252
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
354 |
clean_after_client_disappeared(s, index); |
92
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
355 |
return NOBREAK; |
8 | 356 |
} |
134
5a6b8bb1f7a8
Fixing two bugs noted in buglist.bug (ts clients not dying on removejob, queue
viric@llimona
parents:
129
diff
changeset
|
357 |
else if (res == 0) |
2 | 358 |
{ |
252
f0af96f58947
Fixing the problem of ts clients being killed. The queue should be reusable
viric@mandarina
parents:
239
diff
changeset
|
359 |
clean_after_client_disappeared(s, index); |
2 | 360 |
return NOBREAK; |
361 |
} |
|
1 | 362 |
|
2 | 363 |
/* Process message */ |
260
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
364 |
switch(m.type) |
22 | 365 |
{ |
260
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
366 |
case KILL_SERVER: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
367 |
return BREAK; /* break in the parent*/ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
368 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
369 |
case NEWJOB: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
370 |
client_cs[index].jobid = s_newjob(s, &m); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
371 |
client_cs[index].hasjob = 1; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
372 |
s_newjob_ok(index); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
373 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
374 |
case RUNJOB_OK: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
375 |
{ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
376 |
char *buffer = 0; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
377 |
if (m.u.output.store_output) |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
378 |
{ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
379 |
/* Receive the output filename */ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
380 |
buffer = (char *) malloc(m.u.output.ofilename_size); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
381 |
res = recv_bytes(s, buffer, |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
382 |
m.u.output.ofilename_size); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
383 |
if (res != m.u.output.ofilename_size) |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
384 |
error("Reading the ofilename"); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
385 |
} |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
386 |
s_process_runjob_ok(client_cs[index].jobid, buffer, |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
387 |
m.u.output.pid); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
388 |
} |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
389 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
390 |
case LIST: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
391 |
s_list(s); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
392 |
/* We must actively close, meaning End of Lines */ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
393 |
close(s); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
394 |
remove_connection(index); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
395 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
396 |
case INFO: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
397 |
s_job_info(s, m.u.jobid); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
398 |
close(s); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
399 |
remove_connection(index); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
400 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
401 |
case ENDJOB: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
402 |
job_finished(&m.u.result, client_cs[index].jobid); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
403 |
/* For the dependencies */ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
404 |
check_notify_list(client_cs[index].jobid); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
405 |
/* We don't want this connection to do anything |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
406 |
* more related to the jobid, secially on remove_connection |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
407 |
* when we receive the EOC. */ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
408 |
client_cs[index].hasjob = 0; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
409 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
410 |
case CLEAR_FINISHED: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
411 |
s_clear_finished(); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
412 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
413 |
case ASK_OUTPUT: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
414 |
s_send_output(s, m.u.jobid); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
415 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
416 |
case REMOVEJOB: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
417 |
{ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
418 |
int went_ok; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
419 |
went_ok = s_remove_job(s, m.u.jobid); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
420 |
if (went_ok) |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
421 |
{ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
422 |
int i; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
423 |
for(i = 0; i < nconnections; ++i) |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
424 |
{ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
425 |
if (client_cs[i].hasjob && client_cs[i].jobid == m.u.jobid) |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
426 |
{ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
427 |
close(client_cs[i].socket); |
146 | 428 |
|
260
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
429 |
/* So remove_connection doesn't call s_removejob again */ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
430 |
client_cs[i].hasjob = 0; |
20
d85b4c0745fa
"-c" added, for clearing the finished tasks' list.
viric@llimona
parents:
19
diff
changeset
|
431 |
|
260
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
432 |
/* We don't try to remove any notification related to |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
433 |
* 'i', because it will be for sure a ts client for a job */ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
434 |
remove_connection(i); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
435 |
} |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
436 |
} |
134
5a6b8bb1f7a8
Fixing two bugs noted in buglist.bug (ts clients not dying on removejob, queue
viric@llimona
parents:
129
diff
changeset
|
437 |
} |
5a6b8bb1f7a8
Fixing two bugs noted in buglist.bug (ts clients not dying on removejob, queue
viric@llimona
parents:
129
diff
changeset
|
438 |
} |
260
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
439 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
440 |
case WAITJOB: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
441 |
s_wait_job(s, m.u.jobid); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
442 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
443 |
case WAIT_RUNNING_JOB: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
444 |
s_wait_running_job(s, m.u.jobid); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
445 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
446 |
case URGENT: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
447 |
s_move_urgent(s, m.u.jobid); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
448 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
449 |
case SET_MAX_SLOTS: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
450 |
s_set_max_slots(m.u.max_slots); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
451 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
452 |
case GET_MAX_SLOTS: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
453 |
s_get_max_slots(s); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
454 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
455 |
case SWAP_JOBS: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
456 |
s_swap_jobs(s, m.u.swap.jobid1, |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
457 |
m.u.swap.jobid2); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
458 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
459 |
case GET_STATE: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
460 |
s_send_state(s, m.u.jobid); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
461 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
462 |
case GET_VERSION: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
463 |
s_send_version(s); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
464 |
break; |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
465 |
default: |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
466 |
/* Command not supported */ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
467 |
/* On unknown message, we close the client, |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
468 |
or it may hang waiting for an answer */ |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
469 |
warning("Unknown message: %i", m.type); |
ecd09b351170
Adding version control in the protocol. It can't check with older versions.
viric@mandarina
parents:
256
diff
changeset
|
470 |
return CLOSE; |
63 | 471 |
} |
472 |
||
2 | 473 |
return NOBREAK; /* normal */ |
1 | 474 |
} |
4 | 475 |
|
218 | 476 |
static void s_runjob(int jobid, int index) |
8 | 477 |
{ |
478 |
int s; |
|
479 |
||
92
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
480 |
if (!client_cs[index].hasjob) |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
481 |
error("Run job of the client %i which doesn't have any job", index); |
8 | 482 |
|
483 |
s = client_cs[index].socket; |
|
484 |
||
218 | 485 |
s_send_runjob(s, jobid); |
8 | 486 |
} |
487 |
||
488 |
static void s_newjob_ok(int index) |
|
4 | 489 |
{ |
490 |
int s; |
|
491 |
struct msg m; |
|
492 |
||
92
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
493 |
if (!client_cs[index].hasjob) |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
494 |
error("Run job of the client %i which doesn't have any job", index); |
4 | 495 |
|
496 |
s = client_cs[index].socket; |
|
497 |
||
498 |
m.type = NEWJOB_OK; |
|
499 |
m.u.jobid = client_cs[index].jobid; |
|
500 |
||
92
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
501 |
send_msg(s, &m); |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
502 |
} |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
503 |
|
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
504 |
static void dump_conn_struct(FILE *out, const struct Client_conn *p) |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
505 |
{ |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
506 |
fprintf(out, " new_conn\n"); |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
507 |
fprintf(out, " socket %i\n", p->socket); |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
508 |
fprintf(out, " hasjob \"%i\"\n", p->hasjob); |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
509 |
fprintf(out, " jobid %i\n", p->jobid); |
4 | 510 |
} |
92
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
511 |
|
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
512 |
void dump_conns_struct(FILE *out) |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
513 |
{ |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
514 |
int i; |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
515 |
|
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
516 |
fprintf(out, "New_conns"); |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
517 |
|
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
518 |
for(i=0; i < nconnections; ++i) |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
519 |
{ |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
520 |
dump_conn_struct(out, &client_cs[i]); |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
521 |
} |
05004c52ecff
Better error reports on internal handled errors.
viric@llimona
parents:
66
diff
changeset
|
522 |
} |