Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

osd/OSD.h: make some members private #11085

Merged
merged 1 commit into from
Sep 14, 2016
Merged

osd/OSD.h: make some members private #11085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/osd/OSD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,12 @@ class OSDService {
class OSD : public Dispatcher,
public md_config_obs_t {
/** OSD **/
Mutex osd_lock; // global lock
SafeTimer tick_timer; // safe timer (osd_lock)

// Tick timer for those stuff that do not need osd_lock
Mutex tick_timer_lock;
SafeTimer tick_timer_without_osd_lock;
public:
// config observer bits
virtual const char** get_tracked_conf_keys() const;
Expand All @@ -1190,12 +1196,6 @@ class OSD : public Dispatcher,
void check_config();

protected:
Mutex osd_lock; // global lock
SafeTimer tick_timer; // safe timer (osd_lock)

// Tick timer for those stuff that do not need osd_lock
Mutex tick_timer_lock;
SafeTimer tick_timer_without_osd_lock;

static const double OSD_TICK_INTERVAL; // tick interval for tick_timer and tick_timer_without_osd_lock

Expand Down