Commit 76889da1 authored by AdamSimpson's avatar AdamSimpson
Browse files

get rid of heartbeat cruft and remove coroutine definition warning

parent d9f6ac33

CMakeLists.txt

+9 −11
Original line number Diff line number Diff line
@@ -46,22 +46,20 @@ add_executable(BuilderQueue ${SOURCE_FILES_QUEUE}) 
add_executable(ContainerBuilder ${SOURCE_FILES_BUILDER})

add_executable(ContainerBuilderClient ${SOURCE_FILES_CLIENT})



# ignore coroutines deprecation

add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)



set(HARDENING_FLAGS "-Wall -Wextra -fstack-protector-strong -D_FORTIFY_SOURCE=2 -fPIE -fpie -fno-omit-frame-pointer")

# https://github.com/boostorg/coroutine/issues/30

# -fsanitize=address,undefined -fno-sanitize=vptr -Wl,-z,noexecstack,-z,now,-z,relro,-z,nodlopen





set_target_properties(BuilderQueue PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} ${HARDENING_FLAGS}")

set_target_properties(BuilderQueue

        PROPERTIES LINK_FLAGS "${LINK_FLAGS} ${HARDENING_FLAGS}")

set_target_properties(ContainerBuilder

        PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} ${HARDENING_FLAGS}")

set_target_properties(ContainerBuilder

        PROPERTIES LINK_FLAGS "${LINK_FLAGS} ${HARDENING_FLAGS}")

set_target_properties(ContainerBuilderClient

        PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} ${HARDENING_FLAGS}")

set_target_properties(ContainerBuilderClient

        PROPERTIES LINK_FLAGS "${LINK_FLAGS} ${HARDENING_FLAGS}")

set_target_properties(BuilderQueue PROPERTIES LINK_FLAGS "${LINK_FLAGS} ${HARDENING_FLAGS}")

set_target_properties(ContainerBuilder PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} ${HARDENING_FLAGS}")

set_target_properties(ContainerBuilder PROPERTIES LINK_FLAGS "${LINK_FLAGS} ${HARDENING_FLAGS}")

set_target_properties(ContainerBuilderClient PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} ${HARDENING_FLAGS}")

set_target_properties(ContainerBuilderClient PROPERTIES LINK_FLAGS "${LINK_FLAGS} ${HARDENING_FLAGS}")



set(THREADS_PREFER_PTHREAD_FLAG ON)

find_package(Threads REQUIRED)

Client/main.cpp

+9 −3
Original line number Diff line number Diff line
@@ -82,11 +82,13 @@ int main(int argc, char *argv[]) { 
                        builder_messenger.async_send_file(definition_path, yield);



                        std::cout << "Start reading builder output:" << std::endl;

                        std::string line;

                        boost::system::error_code read_ec;



                        // Hide the cursor so it doesn't jump all around the screen

                        std::cout<<"\e[?25l"<<std::flush;



                        std::string line;

                        do {

                            auto line = builder_messenger.async_receive(yield);

                            line = builder_messenger.async_receive(yield);

                            std::cout << line;

                        } while (!line.empty());
@@ -110,5 +112,9 @@ int main(int argc, char *argv[]) { 


    std::cout << "Client shutting down\n";



    // Show the cursor

    std::cout<<"\e[?25h"<<std::flush;





    return 0;

}
 
 No newline at end of file