X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Flib%2FServer.hpp;h=5e263267b1cdd252d61180d9d8808fe0c3061701;hb=fb3710011600c04359d26615be7a92df1742a3e9;hp=f37c79a5e734d6a63297864b4ea50e3d987ab6c0;hpb=0bbdb4d274f7a2abc4383b5427c3aa600aa2f475;p=m6w6%2Flibmemcached diff --git a/test/lib/Server.hpp b/test/lib/Server.hpp index f37c79a5..5e263267 100644 --- a/test/lib/Server.hpp +++ b/test/lib/Server.hpp @@ -1,3 +1,18 @@ +/* + +--------------------------------------------------------------------+ + | libmemcached - C/C++ Client Library for memcached | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted under the terms of the BSD license. | + | You should have received a copy of the license in a bundled file | + | named LICENSE; in case you did not receive a copy you can review | + | the terms online at: https://opensource.org/licenses/BSD-3-Clause | + +--------------------------------------------------------------------+ + | Copyright (c) 2006-2014 Brian Aker https://datadifferential.com/ | + | Copyright (c) 2020 Michael Wallner | + +--------------------------------------------------------------------+ +*/ + #pragma once #include "common.hpp" @@ -7,7 +22,6 @@ class Server { public: - friend class Cluster; using arg_func_t = function; @@ -15,18 +29,15 @@ public: using arg_pair_t = pair; using argv_t = vector>; - explicit - Server(string binary_ = "false", argv_t args_ = {}); + explicit Server(string binary_ = "false", argv_t args_ = {}); ~Server(); Server(const Server &s); - Server &operator = (const Server &s); + Server &operator=(const Server &s); - Server(Server &&s) { - *this = move(s); - }; - Server &operator = (Server &&s) { + Server(Server &&s) { *this = move(s); }; + Server &operator=(Server &&s) { binary = exchange(s.binary, "false"); args = exchange(s.args, {}); pid = exchange(s.pid, 0); @@ -49,9 +60,7 @@ public: int pipe; ChildProc(pid_t pid_, int pipe_) : pid{pid_} - , pipe{pipe_} - { - } + , pipe{pipe_} {} }; optional start(); bool stop(); @@ -65,7 +74,6 @@ public: bool tryWait(); string &drain(); - private: string binary; argv_t args; @@ -77,12 +85,11 @@ private: socket_or_port_t socket_or_port = 11211; string output; - [[nodiscard]] - vector createArgv(); + [[nodiscard]] vector createArgv(); optional handleArg(vector &arr, const string &arg, const arg_func_t &next_arg); }; -inline ostream &operator << (ostream &out, const socket_or_port_t sop) { +inline ostream &operator<<(ostream &out, const socket_or_port_t sop) { if (holds_alternative(sop)) { out << get(sop); } else { @@ -91,7 +98,8 @@ inline ostream &operator << (ostream &out, const socket_or_port_t sop) { return out; } -inline ostream &operator << (ostream &out, const Server &server) { - out << "Server{binary=" << server.getBinary() << ",pid=" << server.getPid() << ",conn=" << server.getSocketOrPort() << "}"; +inline ostream &operator<<(ostream &out, const Server &server) { + out << "Server{binary=" << server.getBinary() << ",pid=" << server.getPid() + << ",conn=" << server.getSocketOrPort() << "}"; return out; }