formatting

This commit is contained in:
Benjamin Sergeant 2020-03-24 20:37:55 -07:00
parent 37cb2cc266
commit 61e789d6a4
7 changed files with 15 additions and 15 deletions

View File

@ -92,7 +92,8 @@ namespace ix
return std::make_tuple(method, requestUri, httpVersion); return std::make_tuple(method, requestUri, httpVersion);
} }
std::tuple<bool, std::string, HttpRequestPtr> Http::parseRequest(std::unique_ptr<Socket>& socket) std::tuple<bool, std::string, HttpRequestPtr> Http::parseRequest(
std::unique_ptr<Socket>& socket)
{ {
HttpRequestPtr httpRequest; HttpRequestPtr httpRequest;

View File

@ -8,8 +8,8 @@
#include "IXDNSLookup.h" #include "IXDNSLookup.h"
#include "IXNetSystem.h" #include "IXNetSystem.h"
#include "IXSocket.h"
#include "IXSelectInterrupt.h" #include "IXSelectInterrupt.h"
#include "IXSocket.h"
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -7,11 +7,11 @@
#include "IXSocketServer.h" #include "IXSocketServer.h"
#include "IXNetSystem.h" #include "IXNetSystem.h"
#include "IXSelectInterrupt.h"
#include "IXSetThreadName.h" #include "IXSetThreadName.h"
#include "IXSocket.h" #include "IXSocket.h"
#include "IXSocketConnect.h" #include "IXSocketConnect.h"
#include "IXSocketFactory.h" #include "IXSocketFactory.h"
#include "IXSelectInterrupt.h"
#include <assert.h> #include <assert.h>
#include <sstream> #include <sstream>
#include <stdio.h> #include <stdio.h>
@ -259,7 +259,8 @@ namespace ix
int timeoutMs = 10; int timeoutMs = 10;
bool readyToRead = true; bool readyToRead = true;
auto selectInterrupt = std::make_unique<SelectInterrupt>(); auto selectInterrupt = std::make_unique<SelectInterrupt>();
PollResultType pollResult = Socket::poll(readyToRead, timeoutMs, _serverFd, selectInterrupt); PollResultType pollResult =
Socket::poll(readyToRead, timeoutMs, _serverFd, selectInterrupt);
if (pollResult == PollResultType::Error) if (pollResult == PollResultType::Error)
{ {
@ -340,7 +341,8 @@ namespace ix
std::lock_guard<std::mutex> lock(_connectionsThreadsMutex); std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
_connectionsThreads.push_back(std::make_pair( _connectionsThreads.push_back(std::make_pair(
connectionState, connectionState,
std::thread(&SocketServer::handleConnection, this, std::move(socket), connectionState))); std::thread(
&SocketServer::handleConnection, this, std::move(socket), connectionState)));
} }
} }

View File

@ -41,4 +41,4 @@ namespace ix
{ {
return _ms; return _ms;
} }
} } // namespace ix

View File

@ -4,9 +4,9 @@
* Copyright (c) 2017-2020 Machine Zone, Inc. All rights reserved. * Copyright (c) 2017-2020 Machine Zone, Inc. All rights reserved.
*/ */
#include <string>
#include <chrono> #include <chrono>
#include <stdint.h> #include <stdint.h>
#include <string>
namespace ix namespace ix
{ {
@ -25,4 +25,4 @@ namespace ix
uint64_t _ms; uint64_t _ms;
bool _reported; bool _reported;
}; };
} } // namespace ix

View File

@ -5,11 +5,10 @@
*/ */
#include "IXBench.h" #include "IXBench.h"
#include "linenoise.hpp"
#include <ixwebsocket/IXSocket.h> #include <ixwebsocket/IXSocket.h>
#include <ixwebsocket/IXSocketTLSOptions.h> #include <ixwebsocket/IXSocketTLSOptions.h>
#include <ixwebsocket/IXWebSocket.h> #include <ixwebsocket/IXWebSocket.h>
#include "linenoise.hpp"
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <sstream> #include <sstream>

View File

@ -5,7 +5,9 @@
*/ */
#include "IXBench.h" #include "IXBench.h"
#include <chrono>
#include <condition_variable>
#include <fstream>
#include <ixcrypto/IXBase64.h> #include <ixcrypto/IXBase64.h>
#include <ixcrypto/IXHash.h> #include <ixcrypto/IXHash.h>
#include <ixcrypto/IXUuid.h> #include <ixcrypto/IXUuid.h>
@ -13,10 +15,6 @@
#include <ixwebsocket/IXSocketTLSOptions.h> #include <ixwebsocket/IXSocketTLSOptions.h>
#include <ixwebsocket/IXWebSocket.h> #include <ixwebsocket/IXWebSocket.h>
#include <msgpack11/msgpack11.hpp> #include <msgpack11/msgpack11.hpp>
#include <chrono>
#include <condition_variable>
#include <fstream>
#include <mutex> #include <mutex>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <sstream> #include <sstream>