Index: third_party/crashpad/crashpad/handler/crashpad_handler.ad |
diff --git a/third_party/crashpad/crashpad/handler/crashpad_handler.ad b/third_party/crashpad/crashpad/handler/crashpad_handler.ad |
index 06f625635cf739f799a2cb814ae3536ee4d2ff20..a4918d6f83fcb23d741c1d1795d045062d664acf 100644 |
--- a/third_party/crashpad/crashpad/handler/crashpad_handler.ad |
+++ b/third_party/crashpad/crashpad/handler/crashpad_handler.ad |
@@ -51,14 +51,17 @@ when it determines that the server should exit. |
On Windows, clients register with this server by communicating with it via the |
named pipe identified by the *--pipe-name* argument. Alternatively, the server |
-can create a new pipe with a random name and inform a client of this name via |
-the *--handshake-handle* mechanism; clients may then register by communicating |
-with it via that named pipe. During registration, a client provides the server |
-with an OS event object that it will signal should it crash. The server obtains |
-the client’s process handle and waits on the crash event object for a crash, as |
-well as the client’s process handle for the client to exit cleanly without |
-crashing. When a server started via the *--handshake-handle* mechanism loses all |
-of its clients, it exits after allowing any upload in progress to complete. |
+can inherit an already-created pipe from a parent process by using the |
+*--initial-client-data* mechanism. That argument also takes all of the arguments |
+that would normally be passed in a registration message, and so constitutes |
+registration of the first client. Subsequent clients may then register by |
+communicating with the server via the pipe. During registration, a client |
+provides the server with an OS event object that it will signal should it crash. |
+The server obtains the client’s process handle and waits on the crash event |
+object for a crash, as well as the client’s process handle for the client to |
+exit cleanly without crashing. When a server started via the |
+*--initial-client-data* mechanism loses all of its clients, it exits after |
+allowing any upload in progress to complete. |
On Windows, this executable is built by default as a Windows GUI app, so no |
console will appear in normal usage. This is the version that will typically be |
@@ -107,10 +110,11 @@ Perform the handshake with the initial client on the file descriptor at 'FD'. |
Either this option or *--mach-service*, but not both, is required. This option |
is only valid on OS X. |
-*--handshake-handle*='HANDLE':: |
-Perform the handshake with the initial client on the HANDLE at 'HANDLE'. Either |
-this option or *--pipe-name*, but not both, is required. This option is only |
-valid on Windows. |
+*--initial-client-data*='HANDLE_request_crash_dump','HANDLE_request_non_crash_dump','HANDLE_non_crash_dump_completed','HANDLE_first_pipe_instance','HANDLE_client_process','Address_crash_exception_information','Address_non_crash_exception_information','Address_debug_critical_section':: |
+Register the initial client using the inherited handles and data provided. For |
+more information on the arguments, see the implementations of +CrashpadClient+ |
+and +ExceptionHandlerServer+. Either this option or *--pipe-name*, but not both, |
+is required. This option is only valid on Windows. |
+ |
When this option is present, the server creates a new named pipe at a random |
name and informs its client of the name. The server waits for at least one |
@@ -134,8 +138,8 @@ attempt to upload all captured reports. |
*--pipe-name*='PIPE':: |
Listen on the given pipe name for connections from clients. 'PIPE' must be of |
-the form +\\.\pipe\<somename>+. Either this option or *--handshake-handle*, but |
-not both, is required. This option is only valid on Windows. |
+the form +\\.\pipe\<somename>+. Either this option or *--initial-client-data*, |
+but not both, is required. This option is only valid on Windows. |
+ |
When this option is present, the server creates a named pipe at 'PIPE', a name |
known to both the server and its clients. The server continues running even |