chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v220: Apply "Fixes to user and session saving"
[elogind.git]
/
src
/
shared
/
barrier.h
diff --git
a/src/shared/barrier.h
b/src/shared/barrier.h
index 7f76ec7910283dff10edde66d3122839b31e5e66..b8954694d3bb2149f4928f047095b755dec630ff 100644
(file)
--- a/
src/shared/barrier.h
+++ b/
src/shared/barrier.h
@@
-21,14
+21,9
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <errno.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/types.h>
#include "macro.h"
#include <sys/types.h>
#include "macro.h"
-#include "util.h"
/* See source file for an API description. */
/* See source file for an API description. */
@@
-57,9
+52,13
@@
struct Barrier {
int64_t barriers;
};
int64_t barriers;
};
-int barrier_init(Barrier *obj);
+#define BARRIER_NULL {-1, -1, {-1, -1}, 0}
+
+int barrier_create(Barrier *obj);
void barrier_destroy(Barrier *b);
void barrier_destroy(Barrier *b);
+DEFINE_TRIVIAL_CLEANUP_FUNC(Barrier*, barrier_destroy);
+
void barrier_set_role(Barrier *b, unsigned int role);
bool barrier_place(Barrier *b);
void barrier_set_role(Barrier *b, unsigned int role);
bool barrier_place(Barrier *b);
@@
-87,6
+86,6
@@
static inline bool barrier_is_aborted(Barrier *b) {
}
static inline bool barrier_place_and_sync(Barrier *b) {
}
static inline bool barrier_place_and_sync(Barrier *b) {
- barrier_place(b);
+
(void)
barrier_place(b);
return barrier_sync(b);
}
return barrier_sync(b);
}