~mardy/unity-scopes-api/clientid-1554040

« back to all changes in this revision

Viewing changes to include/unity/scopes/internal/RuntimeImpl.h

  • Committer: Michi Henning
  • Date: 2015-02-25 05:20:57 UTC
  • mfrom: (163.386.1 devel)
  • mto: (163.386.2 devel)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: michi.henning@canonical.com-20150225052057-9p21sge1myzaowcb
Merged devel and resolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
54
54
    ThreadPool::SPtr async_pool() const;
55
55
    ThreadSafeQueue<std::future<void>>::SPtr future_queue() const;
56
56
    boost::log::sources::severity_channel_logger_mt<>& logger() const;
 
57
    boost::log::sources::severity_channel_logger_mt<>& logger(Logger::Channel channel) const;
57
58
    void run_scope(ScopeBase* scope_base,
58
59
                   std::string const& scope_ini_file,
59
60
                   std::promise<void> ready_promise = std::promise<void>());
61
62
    ObjectProxy string_to_proxy(std::string const& s) const;
62
63
    std::string proxy_to_string(ObjectProxy const& proxy) const;
63
64
 
 
65
    std::string cache_directory() const;
 
66
    std::string tmp_directory() const;
 
67
 
64
68
    ~RuntimeImpl();
65
69
 
66
70
private:
67
71
    RuntimeImpl(std::string const& scope_id, std::string const& configfile);
68
72
    void waiter_thread(ThreadSafeQueue<std::future<void>>::SPtr const& queue) const noexcept;
69
 
    std::string demangled_id() const;
 
73
    std::string demangled_id(std::string const& scope_id) const;
70
74
    bool confined() const;
71
75
    std::string confinement_type() const;
72
76
    std::string find_cache_dir() const;
73
77
    std::string find_app_dir() const;
 
78
    std::string find_log_dir(std::string const& id) const;
74
79
    std::string find_tmp_dir() const;
75
80
 
76
81
    bool destroyed_;
87
92
    int reap_interval_;
88
93
    std::string cache_dir_;
89
94
    std::string app_dir_;
 
95
    std::string log_dir_;
90
96
    std::string config_dir_;
91
 
    std::string tmp_dir_;
92
97
    Logger::UPtr logger_;
93
98
    mutable Reaper::SPtr reply_reaper_;
94
99
    mutable ThreadPool::SPtr async_pool_;  // Pool of invocation threads for async query creation