DBusCounterNotifyFunction notify_function; /**< notify function */
void *notify_data; /**< data for notify function */
dbus_bool_t notify_pending : 1; /**< TRUE if the guard value has been crossed */
+ DBusRMutex *mutex; /**< Lock on the entire DBusCounter */
};
/** @} */ /* end of resource limits internals docs */
{
DBusCounter *counter;
- counter = dbus_new (DBusCounter, 1);
+ counter = dbus_new0 (DBusCounter, 1);
if (counter == NULL)
return NULL;
-
+
counter->refcount = 1;
- counter->size_value = 0;
- counter->unix_fd_value = 0;
-#ifdef DBUS_ENABLE_STATS
- counter->peak_size_value = 0;
- counter->peak_unix_fd_value = 0;
-#endif
+ _dbus_rmutex_new_at_location (&counter->mutex);
+ if (counter->mutex == NULL)
+ {
+ dbus_free (counter);
+ counter = NULL;
+ }
- counter->notify_size_guard_value = 0;
- counter->notify_unix_fd_guard_value = 0;
- counter->notify_function = NULL;
- counter->notify_data = NULL;
- counter->notify_pending = FALSE;
-
return counter;
}
DBusCounter *
_dbus_counter_ref (DBusCounter *counter)
{
+ _dbus_rmutex_lock (counter->mutex);
+
_dbus_assert (counter->refcount > 0);
counter->refcount += 1;
+ _dbus_rmutex_unlock (counter->mutex);
+
return counter;
}
void
_dbus_counter_unref (DBusCounter *counter)
{
+ dbus_bool_t last_ref = FALSE;
+
+ _dbus_rmutex_lock (counter->mutex);
+
_dbus_assert (counter->refcount > 0);
counter->refcount -= 1;
+ last_ref = (counter->refcount == 0);
- if (counter->refcount == 0)
+ _dbus_rmutex_unlock (counter->mutex);
+
+ if (last_ref)
{
-
+ _dbus_rmutex_free_at_location (&counter->mutex);
dbus_free (counter);
}
}
_dbus_counter_adjust_size (DBusCounter *counter,
long delta)
{
- long old = counter->size_value;
+ long old = 0;
+
+ _dbus_rmutex_lock (counter->mutex);
+
+ old = counter->size_value;
counter->size_value += delta;
(old >= counter->notify_size_guard_value &&
counter->size_value < counter->notify_size_guard_value)))
counter->notify_pending = TRUE;
+
+ _dbus_rmutex_unlock (counter->mutex);
}
/**
void
_dbus_counter_notify (DBusCounter *counter)
{
+ DBusCounterNotifyFunction notify_function = NULL;
+ void *notify_data = NULL;
+
+ _dbus_rmutex_lock (counter->mutex);
if (counter->notify_pending)
{
counter->notify_pending = FALSE;
- (* counter->notify_function) (counter, counter->notify_data);
+ notify_function = counter->notify_function;
+ notify_data = counter->notify_data;
}
+ _dbus_rmutex_unlock (counter->mutex);
+
+ if (notify_function != NULL)
+ (* notify_function) (counter, notify_data);
}
/**
_dbus_counter_adjust_unix_fd (DBusCounter *counter,
long delta)
{
- long old = counter->unix_fd_value;
+ long old = 0;
+
+ _dbus_rmutex_lock (counter->mutex);
+
+ old = counter->unix_fd_value;
counter->unix_fd_value += delta;
(old >= counter->notify_unix_fd_guard_value &&
counter->unix_fd_value < counter->notify_unix_fd_guard_value)))
counter->notify_pending = TRUE;
+
+ _dbus_rmutex_unlock (counter->mutex);
}
/**
DBusCounterNotifyFunction function,
void *user_data)
{
+ _dbus_rmutex_lock (counter->mutex);
counter->notify_size_guard_value = size_guard_value;
counter->notify_unix_fd_guard_value = unix_fd_guard_value;
counter->notify_function = function;
counter->notify_data = user_data;
counter->notify_pending = FALSE;
+ _dbus_rmutex_unlock (counter->mutex);
}
#ifdef DBUS_ENABLE_STATS