diff --git a/man/sd-journal.xml b/man/sd-journal.xml index 6fc18e71e3..da4e4e1f82 100644 --- a/man/sd-journal.xml +++ b/man/sd-journal.xml @@ -75,13 +75,14 @@ Thread safety - Functions that operate on sd_journal objects are thread agnostic — given - sd_journal pointer may only be used from one specific thread at all times (and it has to - be the very same one during the entire lifetime of the object), but multiple, independent threads may use multiple, - independent objects safely. Other functions — those that are used to send entries to the journal, like - sd_journal_print3 and similar, - or those that are used to retrieve global information like - sd_journal_stream_fd3 and + Functions that operate on sd_journal objects are thread agnostic — a given + sd_journal pointer may only be used from one thread at a time, but multiple + independent threads may use multiple objects concurrently. Some functions — those that are used to send + entries to the journal, like + sd_journal_print3 and + similar, or those that are used to retrieve global information like + sd_journal_stream_fd3 + and sd_journal_get_catalog_for_message_id3 — are fully thread-safe and may be called from multiple threads in parallel. diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml index 56acabb441..187f7ef77c 100644 --- a/man/sd_journal_get_catalog.xml +++ b/man/sd_journal_get_catalog.xml @@ -84,14 +84,12 @@ Notes - Function sd_journal_get_catalog() is thread-agnostic and only - a single specific thread may operate on a given object during its entire lifetime. It is safe to allocate multiple - independent objects and use each from a specific thread in parallel. However, it is not safe to allocate such an - object in one thread, and operate or free it from any other, even if locking is used to ensure these threads do not - operate on it at the very same time. + Function sd_journal_get_catalog() is thread-agnostic and only a single thread + may operate on a given object at any given time. Multiple independent objects may be used from different + threads in parallel. - Function sd_journal_get_catalog_for_message_id() is are thread-safe and may be called in - parallel from multiple threads. + Function sd_journal_get_catalog_for_message_id() is thread-safe and may be + called from multiple threads in parallel. diff --git a/man/threads-aware.xml b/man/threads-aware.xml index 8492ca398f..05e7514f43 100644 --- a/man/threads-aware.xml +++ b/man/threads-aware.xml @@ -6,10 +6,9 @@ - <para id="strict">All functions listed here are thread-agnostic and only a single specific thread may operate on a - given object during its entire lifetime. It is safe to allocate multiple independent objects and use each from a - specific thread in parallel. However, it is not safe to allocate such an object in one thread, and operate or free it - from any other, even if locking is used to ensure these threads do not operate on it at the very same time.</para> + <para id="strict">All functions listed here are thread-agnostic and only a single thread may operate on a + given object at any given time. Different threads may access the same object at different times. Multiple + independent objects may be used from different threads in parallel.</para> <para id="safe">All functions listed here are thread-safe and may be called in parallel from multiple threads.</para>