XFree86-xinitrace.patch

   1 --- XFree86-3.3.4.orig/xc/programs/xinit/xinit.c        Sun Jun 27 12:32:26 1999
   2 +++ XFree86-3.3.4/xc/programs/xinit/xinit.c     Sun Aug  8 22:28:20 1999
   3 @@ -596,30 +596,40 @@
   4                         serverpid = -1;
   5                         break;
   6                 }
   7 -               /*
   8 -                * kludge to avoid race with TCP, giving server time to
   9 -                * set his socket options before we try to open it,
  10 -                * either use the 15 second timeout, or await SIGUSR1.
  11 +
  12 +               /*
  13 +                * before we try the below kludge, see if we are already
  14 +                * ready to connect.  Fast CPUs with cached filesystems
  15 +                * shouldn't have to wait 15 seconds.
  16                  *
  17 -                * If your machine is substantially slower than 15 seconds,
  18 -                * you can easily adjust this value.
  19 +                * pbrown@redhat.com - 06/08/1999
  20                  */
  21 -               alarm (15);
  22 +               if (waitforserver() == 0) {
  23 +                       /*
  24 +                        * kludge to avoid race with TCP, giving server time to
  25 +                        * set his socket options before we try to open it,
  26 +                        * either use the 15 second timeout, or await SIGUSR1.
  27 +                        *
  28 +                        * If your machine is substantially slower than 15 seconds,
  29 +                        * you can easily adjust this value.
  30 +                        */
  31 +                       alarm (15);
  32
  33  #ifndef X_NOT_POSIX
  34 -               sigsuspend(&old);
  35 -               alarm (0);
  36 -               sigprocmask(SIG_SETMASK, &old, NULL);
  37 +                       sigsuspend(&old);
  38 +                       alarm (0);
  39 +                       sigprocmask(SIG_SETMASK, &old, NULL);
  40  #else
  41 -               sigpause (old);
  42 -               alarm (0);
  43 -               sigsetmask (old);
  44 +                       sigpause (old);
  45 +                       alarm (0);
  46 +                       sigsetmask (old);
  47  #endif
  48
  49 -               if (waitforserver() == 0) {
  50 -                       Error("unable to connect to X server\r\n");
  51 -                       shutdown();
  52 -                       serverpid = -1;
  53 +                       if (waitforserver() == 0) {
  54 +                               Error("unable to connect to X server\r\n");
  55 +                               shutdown();
  56 +                               serverpid = -1;
  57 +                       }
  58                 }
  59                 break;
  60         }