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

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

Issue 387143004: Add more interesting return codes to xdisplaycheck. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 5 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
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 fprintf(stderr, "Connected after %d retries\n", tries); 78 fprintf(stderr, "Connected after %d retries\n", tries);
79 79
80 #if defined(USE_AURA) 80 #if defined(USE_AURA)
81 // Check for XInput2 81 // Check for XInput2
82 int opcode, event, err; 82 int opcode, event, err;
83 if (!XQueryExtension(scoped_display.display(), "XInputExtension", &opcode, 83 if (!XQueryExtension(scoped_display.display(), "XInputExtension", &opcode,
84 &event, &err)) { 84 &event, &err)) {
85 fprintf(stderr, 85 fprintf(stderr,
86 "Failed to get XInputExtension on %s.\n", XDisplayName(NULL)); 86 "Failed to get XInputExtension on %s.\n", XDisplayName(NULL));
87 return -1; 87 return -2;
88 } 88 }
89 89
90 int major = 2, minor = 0; 90 int major = 2, minor = 0;
91 if (XIQueryVersion(scoped_display.display(), &major, &minor) == BadRequest) { 91 if (XIQueryVersion(scoped_display.display(), &major, &minor) == BadRequest) {
92 fprintf(stderr, 92 fprintf(stderr,
93 "Server does not have XInput2 on %s.\n", XDisplayName(NULL)); 93 "Server does not have XInput2 on %s.\n", XDisplayName(NULL));
94 return -1; 94 return -3;
95 } 95 }
96 96
97 // Ask for the list of devices. This can cause some Xvfb to crash. 97 // Ask for the list of devices. This can cause some Xvfb to crash.
98 int count = 0; 98 int count = 0;
99 XIDeviceInfo* devices = 99 XIDeviceInfo* devices =
100 XIQueryDevice(scoped_display.display(), XIAllDevices, &count); 100 XIQueryDevice(scoped_display.display(), XIAllDevices, &count);
101 if (devices) 101 if (devices)
102 XIFreeDeviceInfo(devices); 102 XIFreeDeviceInfo(devices);
103 103
104 fprintf(stderr, 104 fprintf(stderr,
105 "XInput2 verified initially sane on %s.\n", XDisplayName(NULL)); 105 "XInput2 verified initially sane on %s.\n", XDisplayName(NULL));
106 #endif 106 #endif
107 return 0; 107 return 0;
108 } 108 }
109 109
110 #if defined(LEAK_SANITIZER) 110 #if defined(LEAK_SANITIZER)
111 // XOpenDisplay leaks memory if it takes more than one try to connect. This 111 // XOpenDisplay leaks memory if it takes more than one try to connect. This
112 // causes LSan bots to fail. We don't care about memory leaks in xdisplaycheck 112 // causes LSan bots to fail. We don't care about memory leaks in xdisplaycheck
113 // anyway, so just disable LSan completely. 113 // anyway, so just disable LSan completely.
114 // This function isn't referenced from the executable itself. Make sure it isn't 114 // This function isn't referenced from the executable itself. Make sure it isn't
115 // stripped by the linker. 115 // stripped by the linker.
116 __attribute__((used)) 116 __attribute__((used))
117 __attribute__((visibility("default"))) 117 __attribute__((visibility("default")))
118 extern "C" int __lsan_is_turned_off() { return 1; } 118 extern "C" int __lsan_is_turned_off() { return 1; }
119 #endif 119 #endif
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