jdk-sandbox: comparison src/hotspot/os/windows/attachListener

equal deleted inserted replaced

-:13588c901957
+:9cf78a70fa4f
 /*
-* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 }
 // open the pipe to the client
 HANDLE Win32AttachOperation::open_pipe() {
-HANDLE hPipe;
+HANDLE hPipe = ::CreateFile( pipe(),  // pipe name
-hPipe = ::CreateFile( pipe(),  // pipe name
 GENERIC_WRITE,   // write only
 0,              // no sharing
 NULL,           // default security attributes
 OPEN_EXISTING,  // opens existing pipe
 0,              // default attributes
 NULL);          // no template file
-if (hPipe != INVALID_HANDLE_VALUE) {
-// shouldn't happen as there is a pipe created per operation
-if (::GetLastError() == ERROR_PIPE_BUSY) {
-::CloseHandle(hPipe);
-return INVALID_HANDLE_VALUE;
-}
-}
 return hPipe;
 }
 // write to the pipe
 BOOL Win32AttachOperation::write_pipe(HANDLE hPipe, char* buf, int len) {
 if (!fSuccess) {
 return fSuccess;
 }
 buf += nwrote;
 len -= nwrote;
-}
+} while (len > 0);
-while (len > 0);
 return TRUE;
 }
 // Complete the operation:
 //   - open the pipe to the client
 thread->set_suspend_equivalent();
 // cleared by handle_special_suspend_equivalent_condition() or
 // java_suspend_self() via check_and_wait_while_suspended()
 HANDLE hPipe = open_pipe();
+int lastError = (int)::GetLastError();
 if (hPipe != INVALID_HANDLE_VALUE) {
 BOOL fSuccess;
 char msg[32];
 _snprintf(msg, sizeof(msg), "%d\n", result);
 fSuccess = write_pipe(hPipe, msg, (int)strlen(msg));
 if (fSuccess) {
 fSuccess = write_pipe(hPipe, (char*)result_stream->base(), (int)(result_stream->size()));
 }
+lastError = (int)::GetLastError();
 // Need to flush buffers
 FlushFileBuffers(hPipe);
 CloseHandle(hPipe);
 if (fSuccess) {
 log_debug(attach)("wrote result of attach operation %s to pipe %s", name(), pipe());
 } else {
-log_error(attach)("failure writing result of operation %s to pipe %s", name(), pipe());
+log_error(attach)("failure (%d) writing result of operation %s to pipe %s", lastError, name(), pipe());
 }
 } else {
-log_error(attach)("could not open pipe %s to send result of operation %s", pipe(), name());
+log_error(attach)("could not open (%d) pipe %s to send result of operation %s", lastError, pipe(), name());
 }
 DWORD res = ::WaitForSingleObject(Win32AttachListener::mutex(), INFINITE);
 if (res == WAIT_OBJECT_0) {
 // nothing to do
 }
 int AttachListener::pd_init() {
 return Win32AttachListener::init();
+}
+// This function is used for Un*x OSes only.
+// We need not to implement it for Windows.
+bool AttachListener::check_socket_file() {
+return false;
 }
 bool AttachListener::init_at_startup() {
 return true;
 }

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 51584	d395677d99f3
child 58679	9c3209ff7550