Formatting (c2a4218e) · Commits · ecpcitest / ADIOS2

source/adios2/toolkit/transport/file/FileHTTP.cpp

+89 −97

Original line number	Diff line number	Diff line
		@@ -17,16 +17,12 @@ namespace adios2
		namespace transport
		{

		FileHTTP::FileHTTP(helper::Comm const &comm)
		: Transport("File", "HTTP", comm)
		{
		}
		FileHTTP::FileHTTP(helper::Comm const &comm) : Transport("File", "HTTP", comm) {}

		FileHTTP::~FileHTTP()
		{
		if (m_IsOpen)
		{

		}
		}

		@@ -40,9 +36,8 @@ void FileHTTP::WaitForOpen()
		}
		}


		void FileHTTP::Open(const std::string &name, const Mode openMode,
		const bool async, const bool directio)
		void FileHTTP::Open(const std::string &name, const Mode openMode, const bool async,
		const bool directio)
		{
		struct protoent *protoent;
		struct hostent *hostent;
		@@ -51,7 +46,8 @@ void FileHTTP::Open(const std::string &name, const Mode openMode,
		m_Name = name;
		/* Build the socket. */
		protoent = getprotobyname("tcp");
		if (protoent == NULL) {
		if (protoent == NULL)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "Open",
		"cannot make getprotobyname");
		}
		@@ -61,14 +57,17 @@ void FileHTTP::Open(const std::string &name, const Mode openMode,

		/* Build the address. */
		hostent = gethostbyname(m_hostname.c_str());
		if (hostent == NULL) {
		if (hostent == NULL)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "Open",
		"error: gethostbyname " + m_hostname);
		}
		in_addr = inet_addr(inet_ntoa((struct in_addr )*(hostent->h_addr_list)));
		if (in_addr == (in_addr_t)-1) {
		if (in_addr == (in_addr_t)-1)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "Open",
		"error: inet_addr " + std::string(*(hostent->h_addr_list)));
		"error: inet_addr " +
		std::string(*(hostent->h_addr_list)));
		}
		sockaddr_in.sin_addr.s_addr = in_addr;
		sockaddr_in.sin_family = AF_INET;
		@@ -77,17 +76,13 @@ void FileHTTP::Open(const std::string &name, const Mode openMode,
		return;
		}

		void FileHTTP::OpenChain(const std::string &name, Mode openMode,
		const helper::Comm &chainComm, const bool async,
		const bool directio)
		void FileHTTP::OpenChain(const std::string &name, Mode openMode, const helper::Comm &chainComm,
		const bool async, const bool directio)
		{
		return;
		}

		void FileHTTP::Write(const char *buffer, size_t size, size_t start)
		{
		return;
		}
		void FileHTTP::Write(const char *buffer, size_t size, size_t start) { return; }

		#ifdef REALLY_WANT_WRITEV
		void FilePOSIX::WriteV(const core::iovec *iov, const int iovcnt, size_t start)
		@@ -145,12 +140,10 @@ void FilePOSIX::WriteV(const core::iovec *iov, const int iovcnt, size_t start)
		}

		// write the rest one by one
		Write(static_cast<const char *>(iov[c].iov_base) + pos,
		iov[c].iov_len - pos);
		Write(static_cast<const char *>(iov[c].iov_base) + pos, iov[c].iov_len - pos);
		for (; c < iovcnt; ++c)
		{
		Write(static_cast<const char *>(iov[c].iov_base),
		iov[c].iov_len);
		Write(static_cast<const char *>(iov[c].iov_base), iov[c].iov_len);
		}
		}
		};
		@@ -164,10 +157,10 @@ void FilePOSIX::WriteV(const core::iovec *iov, const int iovcnt, size_t start)

		if (static_cast<size_t>(newPosition) != start)
		{
		helper::Throw<std::ios_base::failure>(
		"Toolkit", "transport::file::FilePOSIX", "WriteV",
		"couldn't move to start position " + std::to_string(start) +
		" in file " + m_Name + " " + SysErrMsg());
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FilePOSIX", "WriteV",
		"couldn't move to start position " +
		std::to_string(start) + " in file " + m_Name +
		" " + SysErrMsg());
		}
		}

		@@ -189,30 +182,39 @@ void FileHTTP::Read(char *buffer, size_t size, size_t start)
		{
		/* not using BUFSIZ, the server might use another value for that */
		const size_t BUF_SIZE = 8192;
		enum CONSTEXPR { MAX_REQUEST_LEN = 1024};
		enum CONSTEXPR
		{
		MAX_REQUEST_LEN = 1024
		};
		char request[MAX_REQUEST_LEN] = {'\0'};
		int request_len =
		snprintf(request, MAX_REQUEST_LEN, request_template, m_Name.c_str(),
		int request_len = snprintf(request, MAX_REQUEST_LEN, request_template, m_Name.c_str(),
		m_hostname.c_str(), start, start + size - 1);
		if (request_len >= MAX_REQUEST_LEN) {
		if (request_len >= MAX_REQUEST_LEN)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "Read",
		"request length too long: " + std::to_string(request_len));
		"request length too long: " +
		std::to_string(request_len));
		}
		m_socketFileDescriptor = socket(AF_INET, SOCK_STREAM, m_p_proto);
		if (m_socketFileDescriptor == -1) {
		if (m_socketFileDescriptor == -1)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "Read",
		"cannot open socket");
		}
		/* Actually connect. */
		if (connect(m_socketFileDescriptor, (struct sockaddr*)&sockaddr_in, sizeof(sockaddr_in)) == -1) {
		if (connect(m_socketFileDescriptor, (struct sockaddr *)&sockaddr_in, sizeof(sockaddr_in)) == -1)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "Read",
		"cannot connect");
		}
		/* Send HTTP request. */
		int nbytes_total = 0;
		while (nbytes_total < request_len) {
		int nbytes_last = write(m_socketFileDescriptor, request + nbytes_total, request_len - nbytes_total);
		if (nbytes_last == -1) {
		while (nbytes_total < request_len)
		{
		int nbytes_last =
		write(m_socketFileDescriptor, request + nbytes_total, request_len - nbytes_total);
		if (nbytes_last == -1)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "Read",
		"cannot send request");
		}
		@@ -221,9 +223,12 @@ void FileHTTP::Read(char *buffer, size_t size, size_t start)

		/* Read the response. */
		size_t bytes_recd = 0;
		while (bytes_recd < size){
		nbytes_total = read(m_socketFileDescriptor, buffer + bytes_recd, std::min(size - bytes_recd, BUF_SIZE));
		if (nbytes_total == -1) {
		while (bytes_recd < size)
		{
		nbytes_total = read(m_socketFileDescriptor, buffer + bytes_recd,
		std::min(size - bytes_recd, BUF_SIZE));
		if (nbytes_total == -1)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "Read",
		"cannot get response");
		}
		@@ -232,37 +237,46 @@ void FileHTTP::Read(char *buffer, size_t size, size_t start)

		close(m_socketFileDescriptor);
		return;

		}

		size_t FileHTTP::GetSize()
		{
		char request_template[] = "GET %s HTTP/1.1\r\nHost: %s\r\nContent-Length: bytes\r\n\r\n";
		enum CONSTEXPR { MAX_REQUEST_LEN = 1024, BUF_SIZE = 128};
		enum CONSTEXPR
		{
		MAX_REQUEST_LEN = 1024,
		BUF_SIZE = 128
		};
		char request[MAX_REQUEST_LEN];
		char buffer[BUF_SIZE] = {'\0'};
		int request_len =
		snprintf(request, MAX_REQUEST_LEN, request_template, m_Name.c_str(),
		m_hostname.c_str());
		if (request_len >= MAX_REQUEST_LEN) {
		snprintf(request, MAX_REQUEST_LEN, request_template, m_Name.c_str(), m_hostname.c_str());
		if (request_len >= MAX_REQUEST_LEN)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "GetSize",
		"request length too long: " + std::to_string(request_len));
		"request length too long: " +
		std::to_string(request_len));
		}
		m_socketFileDescriptor = socket(AF_INET, SOCK_STREAM, m_p_proto);
		if (m_socketFileDescriptor == -1) {
		if (m_socketFileDescriptor == -1)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "GetSize",
		"cannot bind socket");
		}
		/* Actually connect. */
		if (connect(m_socketFileDescriptor, (struct sockaddr*)&sockaddr_in, sizeof(sockaddr_in)) == -1) {
		if (connect(m_socketFileDescriptor, (struct sockaddr *)&sockaddr_in, sizeof(sockaddr_in)) == -1)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "GetSize",
		"cannot connect");
		}
		/* Send HTTP request. */
		int nbytes_total = 0;
		while (nbytes_total < request_len) {
		int nbytes_last = write(m_socketFileDescriptor, request + nbytes_total, request_len - nbytes_total);
		if (nbytes_last == -1) {
		while (nbytes_total < request_len)
		{
		int nbytes_last =
		write(m_socketFileDescriptor, request + nbytes_total, request_len - nbytes_total);
		if (nbytes_last == -1)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "GetSize",
		"sending request failed");
		}
		@@ -270,8 +284,10 @@ size_t FileHTTP::GetSize()
		}

		/* Read the response. */
		while ((nbytes_total = read(m_socketFileDescriptor, buffer, BUF_SIZE)) > 0);
		if (nbytes_total == -1) {
		while ((nbytes_total = read(m_socketFileDescriptor, buffer, BUF_SIZE)) > 0)
		;
		if (nbytes_total == -1)
		{
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FileHTTP", "GetSize",
		"receiving response failed");
		}
		@@ -285,59 +301,35 @@ void FileHTTP::Flush()
		{
		/* Turn this off now because BP3/BP4 calls manager Flush and this syncing
		* slows down IO performance */

		}

		void FileHTTP::Close()
		{
		return;
		}
		void FileHTTP::Close() { return; }

		void FileHTTP::Delete()
		{
		return;
		}
		void FileHTTP::Delete() { return; }

		void FileHTTP::CheckFile(const std::string hint) const
		{
		if (m_socketFileDescriptor == -1)
		{
		helper::Throw<std::ios_base::failure>("Toolkit",
		"transport::file::FilePOSIX",
		"CheckFile", hint + SysErrMsg());
		helper::Throw<std::ios_base::failure>("Toolkit", "transport::file::FilePOSIX", "CheckFile",
		hint + SysErrMsg());
		}
		}

		std::string FileHTTP::SysErrMsg() const
		{
		return std::string(": errno = " + std::to_string(m_Errno) + ": " +
		strerror(m_Errno));
		return std::string(": errno = " + std::to_string(m_Errno) + ": " + strerror(m_Errno));
		}

		void FileHTTP::SeekToEnd()
		{
		return;
		}
		void FileHTTP::SeekToEnd() { return; }

		void FileHTTP::SeekToBegin()
		{
		return;
		}
		void FileHTTP::SeekToBegin() { return; }

		void FileHTTP::Seek(const size_t start)
		{
		return;
		}
		void FileHTTP::Seek(const size_t start) { return; }

		void FileHTTP::Truncate(const size_t length)
		{
		return;
		}
		void FileHTTP::Truncate(const size_t length) { return; }

		void FileHTTP::MkDir(const std::string &fileName)
		{
		return;
		}
		void FileHTTP::MkDir(const std::string &fileName) { return; }

		} // end namespace transport
		} // end namespace adios2

source/adios2/toolkit/transport/file/FileHTTP.h

+12 −14

Original line number	Diff line number	Diff line
		@@ -32,19 +32,17 @@ public:

		~FileHTTP();

		void Open(const std::string &name, const Mode openMode,
		const bool async = false, const bool directio = false) final;

		void OpenChain(const std::string &name, Mode openMode,
		const helper::Comm &chainComm, const bool async = false,
		void Open(const std::string &name, const Mode openMode, const bool async = false,
		const bool directio = false) final;

		void OpenChain(const std::string &name, Mode openMode, const helper::Comm &chainComm,
		const bool async = false, const bool directio = false) final;

		void Write(const char *buffer, size_t size, size_t start = MaxSizeT) final;

		#ifdef REALLY_WANT_WRITEV
		/* Actual writev() function, inactive for now */
		void WriteV(const core::iovec *iov, const int iovcnt,
		size_t start = MaxSizeT) final;
		void WriteV(const core::iovec *iov, const int iovcnt, size_t start = MaxSizeT) final;
		#endif

		void Read(char *buffer, size_t size, size_t start = MaxSizeT) final;

Admin message