ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/init.C
(Generate patch)

Comparing deliantra/server/server/init.C (file contents):
Revision 1.85 by root, Mon Oct 29 23:55:55 2012 UTC vs.
Revision 1.86 by root, Mon Dec 17 02:07:15 2012 UTC

… …
343 LOG (llevError, "SIGABRT received.\n"); 343 LOG (llevError, "SIGABRT received.\n");
344 cleanup ("SIGABRT received", 1); 344 cleanup ("SIGABRT received", 1);
345} 345}
346 346
347static void 347static void
348rec_sigquit (int i)
349{
350 signal (SIGQUIT, SIG_IGN);
351
352 LOG (llevInfo, "SIGQUIT received\n");
353 cleanup ("SIGQUIT received", 1);
354}
355
356static void
348rec_sigsegv (int i) 357rec_sigsegv (int i)
349{ 358{
350 signal (SIGSEGV, SIG_DFL); 359 signal (SIGSEGV, SIG_DFL);
351 360
352 LOG (llevError, "SIGSEGV received.\n"); 361 LOG (llevError, "SIGSEGV received.\n");
353 cleanup ("SIGSEGV received", 1); 362 cleanup ("SIGSEGV received", 1);
354} 363}
355 364
356static void 365static void
357rec_sigquit (int i)
358{
359 signal (SIGQUIT, SIG_IGN);
360
361 LOG (llevInfo, "SIGQUIT received\n");
362 cleanup ("SIGQUIT received", 1);
363}
364
365static void
366rec_sigbus (int i) 366rec_sigbus (int i)
367{ 367{
368 signal (SIGBUS, SIG_DFL); 368 signal (SIGBUS, SIG_DFL);
369 369
370 LOG (llevError, "SIGBUS received\n"); 370 LOG (llevError, "SIGBUS received\n");
371 cleanup ("SIGBUS received", 1); 371 cleanup ("SIGBUS received", 1);
372}
373
374static void
375rec_sigfpe (int i)
376{
377 signal (SIGFPE, SIG_DFL);
378
379 LOG (llevError, "SIGFPE received.\n");
380 cleanup ("SIGFPE received", 1);
372} 381}
373 382
374void 383void
375reset_signals () 384reset_signals ()
376{ 385{
377 signal (SIGABRT, SIG_DFL); 386 signal (SIGABRT, SIG_DFL);
378 signal (SIGQUIT, SIG_DFL); 387 signal (SIGQUIT, SIG_DFL);
379 signal (SIGSEGV, SIG_DFL); 388 signal (SIGSEGV, SIG_DFL);
389#ifdef SIGBUS
380 signal (SIGBUS , SIG_DFL); 390 signal (SIGBUS , SIG_DFL);
391#endif
392 signal (SIGFPE , SIG_DFL);
381 signal (SIGINT , SIG_DFL); 393 signal (SIGINT , SIG_DFL);
382 signal (SIGTERM, SIG_DFL); 394 signal (SIGTERM, SIG_DFL);
383} 395}
384 396
385void 397void
… …
401 sa.sa_flags = SA_RESTART; 413 sa.sa_flags = SA_RESTART;
402 414
403 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0); 415 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
404 sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0); 416 sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0);
405 sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0); 417 sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0);
418#ifdef SIGBUS
406 sa.sa_handler = rec_sigbus; sigaction (SIGBUS, &sa, 0); 419 sa.sa_handler = rec_sigbus; sigaction (SIGBUS, &sa, 0);
420#endif
421 sa.sa_handler = rec_sigfpe; sigaction (SIGFPE, &sa, 0);
407 422
408 sa.sa_flags |= SA_ONSTACK; 423 sa.sa_flags |= SA_ONSTACK;
409 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0); 424 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
410} 425}
411 426

Diff Legend

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