Slava Egorov
42164cc140
This reverts commit aa9201b76b.
Reason for revert: blocks G3 roll (b/192627187)
Original change's description:
> [vm] Prefix HOST_OS_* and TARGET_OS_* with DART_
>
> TargetConditionals.h for XCode 13 defines several
> TARGET_OS_* preprocessor symbols that confuse the
> Dart build. There is probably a more targeted fix
> for this, but renaming the symbols that Dart uses
> will also prevent this problem if more symbols
> are added to the platform headers in the future.
>
> See: https://github.com/dart-lang/sdk/issues/46499
>
> TEST=It builds.
> Change-Id: I3b33a03b4a9a14b76d55fe12f8cdefec4b3c3664
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/205633
> Commit-Queue: Zach Anderson <zra@google.com>
> Reviewed-by: Siva Annamalai <asiva@google.com>
TBR=rmacnak@google.com,zra@google.com,asiva@google.com
Change-Id: Ib06ca418c7e9d3b4df62c72c033cd39f462f7667
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/205790
Reviewed-by: Slava Egorov <vegorov@google.com>
Commit-Queue: Slava Egorov <vegorov@google.com>
93 lines
2.3 KiB
C++
93 lines
2.3 KiB
C++
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
#include "platform/globals.h"
|
|
#if defined(HOST_OS_ANDROID)
|
|
|
|
#include "bin/sync_socket.h"
|
|
|
|
#include <errno.h> // NOLINT
|
|
|
|
#include "bin/fdutils.h"
|
|
#include "bin/socket_base.h"
|
|
#include "platform/signal_blocker.h"
|
|
|
|
namespace dart {
|
|
namespace bin {
|
|
|
|
bool SynchronousSocket::Initialize() {
|
|
// Nothing to do on Android.
|
|
return true;
|
|
}
|
|
|
|
static intptr_t Create(const RawAddr& addr) {
|
|
intptr_t fd;
|
|
intptr_t type = SOCK_STREAM;
|
|
fd = NO_RETRY_EXPECTED(socket(addr.ss.ss_family, type, 0));
|
|
if (fd < 0) {
|
|
return -1;
|
|
}
|
|
return fd;
|
|
}
|
|
|
|
static intptr_t Connect(intptr_t fd, const RawAddr& addr) {
|
|
intptr_t result = TEMP_FAILURE_RETRY(
|
|
connect(fd, &addr.addr, SocketAddress::GetAddrLength(addr)));
|
|
if (result == 0) {
|
|
return fd;
|
|
}
|
|
ASSERT(errno != EINPROGRESS);
|
|
FDUtils::SaveErrorAndClose(fd);
|
|
return -1;
|
|
}
|
|
|
|
intptr_t SynchronousSocket::CreateConnect(const RawAddr& addr) {
|
|
intptr_t fd = Create(addr);
|
|
if (fd < 0) {
|
|
return fd;
|
|
}
|
|
return Connect(fd, addr);
|
|
}
|
|
|
|
intptr_t SynchronousSocket::Available(intptr_t fd) {
|
|
return SocketBase::Available(fd);
|
|
}
|
|
|
|
intptr_t SynchronousSocket::GetPort(intptr_t fd) {
|
|
return SocketBase::GetPort(fd);
|
|
}
|
|
|
|
SocketAddress* SynchronousSocket::GetRemotePeer(intptr_t fd, intptr_t* port) {
|
|
return SocketBase::GetRemotePeer(fd, port);
|
|
}
|
|
|
|
intptr_t SynchronousSocket::Read(intptr_t fd,
|
|
void* buffer,
|
|
intptr_t num_bytes) {
|
|
return SocketBase::Read(fd, buffer, num_bytes, SocketBase::kSync);
|
|
}
|
|
|
|
intptr_t SynchronousSocket::Write(intptr_t fd,
|
|
const void* buffer,
|
|
intptr_t num_bytes) {
|
|
return SocketBase::Write(fd, buffer, num_bytes, SocketBase::kSync);
|
|
}
|
|
|
|
void SynchronousSocket::ShutdownRead(intptr_t fd) {
|
|
VOID_NO_RETRY_EXPECTED(shutdown(fd, SHUT_RD));
|
|
}
|
|
|
|
void SynchronousSocket::ShutdownWrite(intptr_t fd) {
|
|
VOID_NO_RETRY_EXPECTED(shutdown(fd, SHUT_WR));
|
|
}
|
|
|
|
void SynchronousSocket::Close(intptr_t fd) {
|
|
return SocketBase::Close(fd);
|
|
}
|
|
|
|
} // namespace bin
|
|
} // namespace dart
|
|
|
|
#endif // defined(HOST_OS_ANDROID)
|