Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: tools/xdisplaycheck/xdisplaycheck.cc

Issue 10409035: Add a mode to ensure a server is not already running. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This is a small program that tries to connect to the X server. It 5 // This is a small program that tries to connect to the X server. It
6 // continually retries until it connects or 30 seconds pass. If it fails 6 // continually retries until it connects or 30 seconds pass. If it fails
7 // to connect to the X server or fails to find needed functiona, it returns 7 // to connect to the X server or fails to find needed functiona, it returns
8 // an error code of -1. 8 // an error code of -1.
9 // 9 //
10 // This is to help verify that a useful X server is available before we start 10 // This is to help verify that a useful X server is available before we start
11 // start running tests on the build bots. 11 // start running tests on the build bots.
12 12
13 #include <errno.h> 13 #include <errno.h>
14 #include <stdio.h> 14 #include <stdio.h>
15 #include <string.h>
15 #include <time.h> 16 #include <time.h>
16 #include <X11/Xlib.h> 17 #include <X11/Xlib.h>
17 18
18 #if defined(USE_AURA) 19 #if defined(USE_AURA)
19 #include <X11/extensions/XInput2.h> 20 #include <X11/extensions/XInput2.h>
20 #endif 21 #endif
21 22
22 void Sleep(int duration_ms) { 23 void Sleep(int duration_ms) {
23 struct timespec sleep_time, remaining; 24 struct timespec sleep_time, remaining;
24 25
25 // Contains the portion of duration_ms >= 1 sec. 26 // Contains the portion of duration_ms >= 1 sec.
26 sleep_time.tv_sec = duration_ms / 1000; 27 sleep_time.tv_sec = duration_ms / 1000;
27 duration_ms -= sleep_time.tv_sec * 1000; 28 duration_ms -= sleep_time.tv_sec * 1000;
28 29
29 // Contains the portion of duration_ms < 1 sec. 30 // Contains the portion of duration_ms < 1 sec.
30 sleep_time.tv_nsec = duration_ms * 1000 * 1000; // nanoseconds. 31 sleep_time.tv_nsec = duration_ms * 1000 * 1000; // nanoseconds.
31 32
32 while (nanosleep(&sleep_time, &remaining) == -1 && errno == EINTR) 33 while (nanosleep(&sleep_time, &remaining) == -1 && errno == EINTR)
33 sleep_time = remaining; 34 sleep_time = remaining;
34 } 35 }
35 36
36 int main(int argc, char* argv[]) { 37 int main(int argc, char* argv[]) {
38 Display* display = NULL;
39 if (argv[1] && strcmp(argv[1], "--noserver") == 0) {
40 display = XOpenDisplay(NULL);
41 if (display) {
42 fprintf(stderr, "Found unexpected connectable display %s\n",
43 XDisplayName(NULL));
44 }
45 // Return success when we got an unexpected display so that the code
46 // without the --noserver is the same, but slow, rather than inverted.
47 return !display;
48 }
49
37 int kNumTries = 78; // 78*77/2 * 10 = 30s of waiting 50 int kNumTries = 78; // 78*77/2 * 10 = 30s of waiting
38 Display* display = NULL;
39 int tries; 51 int tries;
40 for (tries = 0; tries < kNumTries; ++tries) { 52 for (tries = 0; tries < kNumTries; ++tries) {
41 display = XOpenDisplay(NULL); 53 display = XOpenDisplay(NULL);
42 if (display) 54 if (display)
43 break; 55 break;
44 Sleep(10 * tries); 56 Sleep(10 * tries);
45 } 57 }
46 58
47 if (!display) { 59 if (!display) {
48 fprintf(stderr, "Failed to connect to %s\n", XDisplayName(NULL)); 60 fprintf(stderr, "Failed to connect to %s\n", XDisplayName(NULL));
(...skipping 23 matching lines...) Expand all
72 XIDeviceInfo* devices = XIQueryDevice(display, XIAllDevices, &count); 84 XIDeviceInfo* devices = XIQueryDevice(display, XIAllDevices, &count);
73 if (devices) 85 if (devices)
74 XIFreeDeviceInfo(devices); 86 XIFreeDeviceInfo(devices);
75 87
76 fprintf(stderr, 88 fprintf(stderr,
77 "XInput2 verified initially sane on %s.\n", XDisplayName(NULL)); 89 "XInput2 verified initially sane on %s.\n", XDisplayName(NULL));
78 #endif 90 #endif
79 91
80 return 0; 92 return 0;
81 } 93 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698