ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtd.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.36 by root, Sat Nov 17 07:28:00 2007 UTC vs.
Revision 1.54 by sf-exg, Fri Nov 19 00:38:59 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtd.C 2 * File: rxvtd.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
31#include <sys/types.h> 31#include <sys/types.h>
32#include <sys/stat.h> 32#include <sys/stat.h>
33#include <sys/socket.h> 33#include <sys/socket.h>
34#include <sys/un.h> 34#include <sys/un.h>
35 35
36#if defined(ENABLE_FRILLS) && defined(_POSIX_MEMLOCK) && _POSIX_MEMLOCK > 0
37# define ENABLE_MLOCK 1
38#endif
39
40#if ENABLE_MLOCK
41# include <sys/mman.h>
42#endif
43
36#include <cerrno> 44#include <cerrno>
37 45
38#include "rxvt.h" 46#include "rxvt.h"
39#include "rxvtdaemon.h" 47#include "rxvtdaemon.h"
40#include "libptytty.h" 48#include "libptytty.h"
… …
46 void read_cb (ev::io &w, int revents); ev::io read_ev; 54 void read_cb (ev::io &w, int revents); ev::io read_ev;
47 void log_msg (const char *msg); 55 void log_msg (const char *msg);
48 int getfd (int remote_fd); 56 int getfd (int remote_fd);
49 57
50 server (int fd) 58 server (int fd)
51 : read_ev (this, &server::read_cb),
52 log_cb (this, &server::log_msg),
53 getfd_cb (this, &server::getfd)
54 { 59 {
60 read_ev.set <server, &server::read_cb> (this);
61 log_cb.set <server, &server::log_msg> (this);
62 getfd_cb.set<server, &server::getfd> (this);
63
64 this->fd = fd;
55 fcntl (fd, F_SETFD, FD_CLOEXEC); 65 fcntl (fd, F_SETFD, FD_CLOEXEC);
56 fcntl (fd, F_SETFL, 0); 66 fcntl (fd, F_SETFL, 0);
57 read_ev.start (fd, ev::READ); 67 read_ev.start (fd, ev::READ);
58 } 68 }
59 69
… …
67 77
68 unix_listener (const char *sockname); 78 unix_listener (const char *sockname);
69}; 79};
70 80
71unix_listener::unix_listener (const char *sockname) 81unix_listener::unix_listener (const char *sockname)
72: accept_ev (this, &unix_listener::accept_cb)
73{ 82{
83 accept_ev.set<unix_listener, &unix_listener::accept_cb> (this);
84
74 sockaddr_un sa; 85 sockaddr_un sa;
75 86
76 if (strlen (sockname) >= sizeof(sa.sun_path)) 87 if (strlen (sockname) >= sizeof(sa.sun_path))
77 { 88 {
78 fputs ("socket name too long, aborting.\n", stderr); 89 fputs ("socket name too long, aborting.\n", stderr);
… …
169 180
170 if (!strcmp (tok, "END")) 181 if (!strcmp (tok, "END"))
171 break; 182 break;
172 else if (!strcmp (tok, "ENV") && recv (tok)) 183 else if (!strcmp (tok, "ENV") && recv (tok))
173 envv->push_back (strdup (tok)); 184 envv->push_back (strdup (tok));
174 else if (!strcmp (tok, "CWD") && recv (tok))
175 {
176 if (chdir (tok))
177 {
178 delete envv;
179 delete argv;
180 return err ("unable to change to working directory to '%s', aborting: %s.\n",
181 (char *)tok, strerror (errno));
182 }
183 }
184 else if (!strcmp (tok, "ARG") && recv (tok)) 185 else if (!strcmp (tok, "ARG") && recv (tok))
185 argv->push_back (strdup (tok)); 186 argv->push_back (strdup (tok));
186 else 187 else
187 return err ("protocol error: unexpected NEW token.\n"); 188 return err ("protocol error: unexpected NEW token.\n");
188 } 189 }
… …
193 rxvt_term *term = new rxvt_term; 194 rxvt_term *term = new rxvt_term;
194 195
195 term->log_hook = &log_cb; 196 term->log_hook = &log_cb;
196 term->getfd_hook = &getfd_cb; 197 term->getfd_hook = &getfd_cb;
197 198
198 bool success; 199 bool success = true;
199 200
200 try 201 try
201 { 202 {
202 success = term->init (argv, envv); 203 term->init (argv, envv);
203 } 204 }
204 catch (const class rxvt_failure_exception &e) 205 catch (const class rxvt_failure_exception &e)
205 { 206 {
206 success = false; 207 success = false;
207 } 208 }
208 209
209 term->log_hook = 0; 210 term->log_hook = 0;
210 211
211 chdir ("/"); 212 chdir ("/"); // init might change to different working directory
212 213
213 if (!success) 214 if (!success)
214 term->destroy (); 215 term->destroy ();
215 216
216 send ("END"); send (success ? 1 : 0); 217 send ("END"); send (success ? 1 : 0);
… …
221 } 222 }
222 else 223 else
223 return err (); 224 return err ();
224} 225}
225 226
226int opt_fork, opt_opendisplay, opt_quiet;
227
228int 227int
229main (int argc, const char *const *argv) 228main (int argc, const char *const *argv)
230{ 229{
231 rxvt_init (); 230 ptytty::init ();
231
232 static char opt_fork, opt_opendisplay, opt_quiet;
233#if ENABLE_MLOCK
234 static char opt_lock;
235#endif
232 236
233 for (int i = 1; i < argc; i++) 237 for (int i = 1; i < argc; i++)
234 { 238 {
235 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork")) 239 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
236 opt_fork = 1; 240 opt_fork = 1;
237 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay")) 241 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
238 opt_opendisplay = 1; 242 opt_opendisplay = 1;
239 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet")) 243 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
240 opt_quiet = 1; 244 opt_quiet = 1;
245#if ENABLE_MLOCK
246 else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
247 opt_lock = 1;
248#endif
241 else 249 else
242 { 250 {
243 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]); 251 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
244 return EXIT_FAILURE; 252 return EXIT_FAILURE;
245 } 253 }
246 } 254 }
247 255
248 chdir ("/"); 256 rxvt_init ();
249 257
258 // optionally open display and never release it.
250 if (opt_opendisplay) 259 if (opt_opendisplay)
251 displays.get (getenv ("DISPLAY")); // open display and never release it 260 if (const char *dpy = getenv ("DISPLAY"))
261 displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
252 262
253 char *sockname = rxvt_connection::unix_sockname (); 263 char *sockname = rxvt_connection::unix_sockname ();
254 unix_listener l (sockname); 264 unix_listener l (sockname);
255 265
266 chdir ("/");
267
256 if (!opt_quiet) 268 if (!opt_quiet)
257 { 269 {
258 printf ("rxvt-unicode daemon listening on %s.\n", sockname); 270 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
259 fflush (stdout); 271 fflush (stdout);
260 } 272 }
261 273
262 free (sockname); 274 free (sockname);
263 275
276 pid_t pid = 0;
264 if (opt_fork) 277 if (opt_fork)
265 { 278 {
266 pid_t pid = fork (); 279 pid = fork ();
280 }
267 281
282#if ENABLE_MLOCK
283 // Optionally perform an mlockall so this process does not get swapped out.
284 if (opt_lock && !pid)
285 if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0)
286 perror ("unable to lock into ram");
287#endif
288
289 if (opt_fork)
290 {
268 if (pid < 0) 291 if (pid < 0)
269 { 292 {
270 rxvt_log ("unable to fork daemon, aborting.\n"); 293 rxvt_log ("unable to fork daemon, aborting.\n");
271 return EXIT_FAILURE; 294 return EXIT_FAILURE;
272 } 295 }
273 else if (pid > 0) 296 else if (pid > 0)
274 _exit (EXIT_SUCCESS); 297 _exit (EXIT_SUCCESS);
275 }
276 298
277 ev::ev_loop (0); 299 ev_loop_fork (EV_DEFAULT_UC);
300 }
301
302 ev_run ();
278 303
279 return EXIT_SUCCESS; 304 return EXIT_SUCCESS;
280} 305}
281 306

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines