~dandrader/mir/cross-compile-parallel

Viewing changes to examples/basic_server.cpp

Committer: Tarmac
Author(s): Alan Griffiths
Date: 2013-09-26 01:19:16 UTC
mfrom: (1081.4.22 mir3)
Revision ID: tarmac-20130926011916-jmm6x87uckd04y8s

frontend, config: Mechanism for connecting via a socket pair.

Approved by PS Jenkins bot, Kevin DuBois, Alexandros Frantzis.

files added:
include/server/mir/frontend/session_creator.h

src/server/frontend/protobuf_session_creator.cpp

src/server/frontend/protobuf_session_creator.h

files renamed:
include/server/mir/frontend/communicator.h => include/server/mir/frontend/connector.h

include/server/mir/frontend/communicator_report.h => include/server/mir/frontend/connector_report.h

src/server/frontend/make_protobuf_socket_communicator.cpp => src/server/frontend/default_configuration.cpp

src/server/frontend/protobuf_socket_communicator.cpp => src/server/frontend/published_socket_connector.cpp

src/server/frontend/protobuf_socket_communicator.h => src/server/frontend/published_socket_connector.h

tests/unit-tests/frontend/test_protobuf_communicator.cpp => tests/unit-tests/frontend/test_published_socket_connector.cpp

files modified:
examples/basic_server.cpp

examples/render_surfaces.cpp

include/server/mir/default_server_configuration.h

include/server/mir/server_configuration.h

include/test/mir_test/test_protobuf_server.h

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/socket_messenger.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_test_framework.cpp

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_error_reporting.cpp

tests/mir_test_doubles/test_protobuf_socket_server.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_protobuf_reports_errors.cpp

tests/unit-tests/frontend/test_protobuf_sends_fds.cpp

tests/unit-tests/frontend/test_protobuf_surface_apis.cpp

Show diffs side-by-side

added added

removed removed

examples/basic_server.cpp

* Authored by: Alan Griffiths <alan@octopull.co.uk>

#include "server_configuration.h"

#include "mir/abnormal_exit.h"

#include "mir/frontend/connector.h"

#include "mir/options/option.h"

#include "mir/report_exception.h"

#include "mir/run_mir.h"

#include "mir/report_exception.h"

#include "server_configuration.h"

#include <iostream>

namespace

{

char const* const launch_child_opt = "launch-client";

struct ServerConfiguration : mir::examples::ServerConfiguration

{

ServerConfiguration(int argc, char const** argv) :

mir::examples::ServerConfiguration(argc, argv)

{

namespace po = boost::program_options;

add_options()

(launch_child_opt, po::value<std::string>(), "system() command to launch client");

}

void launch_client()

{

if (the_options()->is_set(launch_child_opt))

{

char buffer[128] = {0};

sprintf(buffer, "fd://%d", the_connector()->client_socket_fd());

setenv("MIR_SOCKET", buffer, 1);

auto ignore = system((the_options()->get(launch_child_opt, "") + "&").c_str());

(void)ignore;

}

using mir::examples::ServerConfiguration::the_options;

};

}

int main(int argc, char const* argv[])

try

{

mir::examples::ServerConfiguration config(argc, argv);

ServerConfiguration config(argc, argv);

run_mir(config, [](mir::DisplayServer&) {/* empty init */});

run_mir(config, [&](mir::DisplayServer&){ config.launch_client(); });

return 0;

}

catch (...)

Older »