Commit 83bf091d authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Class urd now belongs to namespace norns

parent 338597fe

src/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int main(int argc, char* argv[]){ 


    settings.m_daemonize = !run_in_foreground;



    urd daemon;

    norns::urd daemon;

    daemon.configure(settings);



    int status = daemon.run();

src/urd.cpp

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ 
#include "make-unique.hpp"

#include "unique-ptr-cast.hpp"



namespace norns {



pid_t urd::daemonize() {

    /*

     * --- Daemonize structure ---
@@ -759,3 +761,5 @@ void urd::teardown() { 
        m_workers.reset();

    }

}



} // namespace norns

src/urd.hpp

+4 −7
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ using backend_manager_ptr = std::unique_ptr<backend_manager>; 
using resource_info_ptr = std::shared_ptr<data::resource_info>;

using resource_ptr = std::shared_ptr<data::resource>;



namespace norns {



class urd {



public:
@@ -74,9 +76,6 @@ public: 
private:

    int daemonize();

    void signal_handler(int);

    //norns_error_t validate_task_args(norns_op_t op, 

    //                                 const foo& src, 

    //                                 const foo& dst) const;



    norns_error_t validate_iotask_args(norns_op_t op, 

                                       resource_info_ptr src_info,
@@ -114,10 +113,8 @@ private: 


    std::unordered_map<norns_tid_t, std::shared_ptr<io::task_stats>> m_task_manager;

    mutable boost::shared_mutex                         m_task_manager_mutex;









};



} // namespace norns 



#endif /* __URD_HPP__ */

tests/fake-daemon.hpp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct fake_daemon { 


    pid_t m_pid = 0;

    bool m_running = false;

    urd m_daemon;

    norns::urd m_daemon;

};



#endif /* __FAKE_DAEMON_HPP__ */