Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit efe2b81

Browse files
Tianyi Chenapavlo
authored andcommitted
format change on peloton_server.h
1 parent bc292fc commit efe2b81

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

src/include/network/peloton_server.h

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@
2020
#include <arpa/inet.h>
2121
#include <netinet/tcp.h>
2222

23+
#include <pthread.h>
24+
#include <sys/file.h>
2325
#include <csignal>
2426
#include <cstdio>
2527
#include <cstdlib>
2628
#include <cstring>
2729
#include <vector>
28-
#include <pthread.h>
29-
#include <sys/file.h>
3030

31+
#include "common/container/lock_free_queue.h"
3132
#include "common/exception.h"
3233
#include "common/logger.h"
33-
#include "common/container/lock_free_queue.h"
34-
#include "notifiable_task.h"
3534
#include "connection_dispatcher_task.h"
36-
#include "protocol_handler.h"
3735
#include "network_state.h"
36+
#include "notifiable_task.h"
37+
#include "protocol_handler.h"
3838

39-
#include <openssl/ssl.h>
39+
#include <openssl/crypto.h>
4040
#include <openssl/err.h>
41+
#include <openssl/ssl.h>
4142
#include <openssl/x509.h>
4243
#include <openssl/x509_vfy.h>
43-
#include <openssl/crypto.h>
4444

4545
namespace peloton {
4646
namespace network {
@@ -58,8 +58,6 @@ class PelotonServer {
5858
*/
5959
PelotonServer();
6060

61-
62-
6361
/**
6462
* @brief Configure the server to spin up all its threads and start listening
6563
* on the configured port.
@@ -98,7 +96,6 @@ class PelotonServer {
9896
// TODO(tianyu): This is VILE. Fix this when we refactor testing.
9997
void SetPort(int new_port);
10098

101-
10299
static void LoadSSLFileSettings();
103100

104101
static void SSLInit();
@@ -109,7 +106,7 @@ class PelotonServer {
109106

110107
static SSLLevel GetSSLLevel() { return ssl_level_; }
111108

112-
static void SSLLockingFunction(int mode, int n, const char* file, int line);
109+
static void SSLLockingFunction(int mode, int n, const char *file, int line);
113110

114111
static unsigned long SSLIdFunction(void);
115112

@@ -135,13 +132,11 @@ class PelotonServer {
135132

136133
std::shared_ptr<ConnectionDispatcherTask> dispatcher_task;
137134

138-
139-
140-
template<typename... Ts>
141-
void TrySslOperation(int(*func)(Ts...), Ts... arg);
135+
template <typename... Ts>
136+
void TrySslOperation(int (*func)(Ts...), Ts... arg);
142137

143138
// For testing purposes
144139
std::shared_ptr<ConnectionDispatcherTask> dispatcher_task_;
145140
};
146-
}
147-
}
141+
} // namespace network
142+
} // namespace peloton

0 commit comments

Comments
 (0)