41910f7263
A previous change is triggering a failure due to SOCKET not being defined in IOStream.h. Adjusting the Windows includes to correct the imports and using a more narrow import (winsock2.h vs windows.h). Also removed a stale comment. Tested this on an x86_64 wins 11 vm. This should fix https://lab.llvm.org/buildbot/#/builders/197/builds/1379 and https://lab.llvm.org/buildbot/#/builders/141/builds/5878
71 lines
1.9 KiB
C++
71 lines
1.9 KiB
C++
//===-- IOStream.h ----------------------------------------------*- C++ -*-===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLDB_TOOLS_LLDB_DAP_IOSTREAM_H
|
|
#define LLDB_TOOLS_LLDB_DAP_IOSTREAM_H
|
|
|
|
#if defined(_WIN32)
|
|
#include "lldb/Host/windows/windows.h"
|
|
#include <winsock2.h>
|
|
#else
|
|
typedef int SOCKET;
|
|
#endif
|
|
|
|
#include "llvm/ADT/StringRef.h"
|
|
|
|
#include <fstream>
|
|
#include <string>
|
|
|
|
// Windows requires different system calls for dealing with sockets and other
|
|
// types of files, so we can't simply have one code path that just uses read
|
|
// and write everywhere. So we need an abstraction in order to allow us to
|
|
// treat them identically.
|
|
namespace lldb_dap {
|
|
struct StreamDescriptor {
|
|
StreamDescriptor();
|
|
~StreamDescriptor();
|
|
StreamDescriptor(StreamDescriptor &&other);
|
|
|
|
StreamDescriptor &operator=(StreamDescriptor &&other);
|
|
|
|
static StreamDescriptor from_socket(SOCKET s, bool close);
|
|
static StreamDescriptor from_file(int fd, bool close);
|
|
|
|
bool m_is_socket = false;
|
|
bool m_close = false;
|
|
union {
|
|
int m_fd;
|
|
SOCKET m_socket;
|
|
};
|
|
};
|
|
|
|
struct InputStream {
|
|
StreamDescriptor descriptor;
|
|
|
|
explicit InputStream(StreamDescriptor descriptor)
|
|
: descriptor(std::move(descriptor)) {}
|
|
|
|
bool read_full(std::ofstream *log, size_t length, std::string &text);
|
|
|
|
bool read_line(std::ofstream *log, std::string &line);
|
|
|
|
bool read_expected(std::ofstream *log, llvm::StringRef expected);
|
|
};
|
|
|
|
struct OutputStream {
|
|
StreamDescriptor descriptor;
|
|
|
|
explicit OutputStream(StreamDescriptor descriptor)
|
|
: descriptor(std::move(descriptor)) {}
|
|
|
|
bool write_full(llvm::StringRef str);
|
|
};
|
|
} // namespace lldb_dap
|
|
|
|
#endif
|