Differential D2199 Diff 9746 source/rlinterface/RLInterface.h

Changeset View

Standalone View

source/rlinterface/RLInterface.h

This file was added.

				/* Copyright (C) 2019 Wildfire Games.
				* This file is part of 0 A.D.
				*
				* 0 A.D. is free software: you can redistribute it and/or modify
				* it under the terms of the GNU General Public License as published by
				* the Free Software Foundation, either version 2 of the License, or
				* (at your option) any later version.
				*
				* 0 A.D. is distributed in the hope that it will be useful,
				* but WITHOUT ANY WARRANTY; without even the implied warranty of
				* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
				* GNU General Public License for more details.
				*
				* You should have received a copy of the GNU General Public License
				* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
				*/
				#ifndef INCLUDED_RLINTERFACE
				#define INCLUDED_RLINTERFACE
				#include <mutex>
				#include <queue>
				StanUnsubmitted Done Inline Actions I think the std headers go below the game ones Stan: I think the std headers go below the game ones
				irishninjaAuthorUnsubmitted Done Inline Actions updated for the next update to the revision. irishninja: updated for the next update to the revision.
				#include <tuple>
				#include <grpc/grpc.h>
				#include <grpcpp/server.h>
				StanUnsubmitted Done Inline Actions Probably don't need that anymore Stan: Probably don't need that anymore
				#include <grpcpp/server_builder.h>
				#include <grpcpp/server_context.h>
				#include <grpcpp/security/server_credentials.h>
				#include "rlinterface/proto/RLAPI.grpc.pb.h"

				StanUnsubmitted Done Inline Actions order alphabetically, + newline bewteen special stl headers Stan: order alphabetically, + newline bewteen special stl headers
				#include "lib/precompiled.h"
				#include "lib/external_libraries/libsdl.h"
				#include "simulation2/Simulation2.h"
				#include "simulation2/components/ICmpAIInterface.h"
				#include "simulation2/components/ICmpTemplateManager.h"
				#include "simulation2/system/TurnManager.h"
				#include "ps/Game.h"
				#include "ps/Loader.h"
				#include "gui/GUIManager.h"
				#include "ps/VideoMode.h"
				#include "ps/GameSetup/GameSetup.h"
				#include "ps/GameSetup/GameConfig.h"
				#include "ps/ThreadUtil.h"
				#include <boost/fiber/unbuffered_channel.hpp>
				#include <boost/fiber/buffered_channel.hpp>

				using grpc::ServerContext;
				StanUnsubmitted Not Done Inline Actions Anything you can forward declare here ? Stan: Anything you can forward declare here ?
				StanUnsubmitted Done Inline Actions Still accurate :) Usually <> libs are below. Stan: Still accurate :) Usually <> libs are below.
				using boost::fibers::unbuffered_channel;
				using boost::fibers::buffered_channel;

				enum GameMessageType { Reset, Commands };
				struct GameMessage {
				GameMessageType type;
				std::queue<std::tuple<int, std::string>> data;
				};
				wraitiiUnsubmitted Not Done Inline Actions I don't think you're using the above classes anywhere else, so you should inline them in the Class imo. And we dislike using declarations, it doesn't hurt that much to put explicit types. If you want to shorten the buffers, use a using-alias instead. wraitii: I don't think you're using the above classes anywhere else, so you should inline them in the…
				extern void EndGame();

				class RLInterface final : public RLAPI::Service
				{

				public:

				grpc::Status Step(ServerContext* context, const Actions* commands, Observation* obs) override;
				grpc::Status Reset(ServerContext* context, const ResetRequest* req, Observation* obs) override;
				grpc::Status GetTemplates(ServerContext* context, const GetTemplateRequest* req, Templates* res) override;

				void Listen(std::string server_address);
				void ApplyEvents(); // Apply RPC messages to the game engine
				std::string GetGameState();
				StanUnsubmitted Done Inline Actions I guess it's pretty straightforward, but if you want to add such comments you can use the doxygen style :) Stan: I guess it's pretty straightforward, but if you want to add such comments you can use the…
				irishninjaAuthorUnsubmitted Done Inline Actions Good point. I can update it irishninja: Good point. I can update it
				StanUnsubmitted Done Inline Actions Still missing :) Stan: Still missing :)
				irishninjaAuthorUnsubmitted Done Inline Actions Ah, yeah it is missing. I figured that the comment wasn't adding that much and just removed it. If you would like a comment instead, I can certainly add one. irishninja: Ah, yeah it is missing. I figured that the comment wasn't adding that much and just removed it.

				private:
				std::unique_ptr<grpc::Server> m_Server;
				unsigned int m_Turn = 0;
				std::mutex m_lock;
				buffered_channel<GameMessage> m_GameMessages{2};
				unbuffered_channel<std::string> m_GameStates;
				bool m_NeedsGameState = false;
				GameConfig m_GameConfig = GameConfig(L"scenario", L"Arcadia");
				StanUnsubmitted Done Inline Actions Is this one used? Stan: Is this one used?
				irishninjaAuthorUnsubmitted Done Inline Actions Nope. Good catch. irishninja: Nope. Good catch.
				};
				#endif // INCLUDED_RLINTERFACE