From fe5ee4280c235005d2fa7eab2af14a352740d4eb Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 23 Jan 2020 16:37:37 -0500 Subject: [PATCH] Typo: occured -> occurred Signed-off-by: Michael Jeanson Change-Id: I57d85deda90603e5c2824b8e0d4d07c71ca291db Reviewed-on: https://review.lttng.org/c/babeltrace/+/2859 CI-Build: Philippe Proulx Tested-by: jenkins Reviewed-by: Philippe Proulx --- doc/api/libbabeltrace2/dox/api-fund.dox | 2 +- ...babeltrace2-filter.lttng-utils.debug-info.7.txt | 4 ++-- doc/man/babeltrace2-sink.ctf.fs.7.txt | 2 +- include/babeltrace2/graph/message-iterator-class.h | 14 +++++++------- include/babeltrace2/graph/message-iterator.h | 14 +++++++------- include/babeltrace2/trace-ir/clock-class.h | 2 +- include/babeltrace2/trace-ir/clock-snapshot.h | 2 +- include/babeltrace2/trace-ir/stream.h | 4 ++-- src/argpar/argpar.c | 2 +- src/plugins/ctf/common/msg-iter/msg-iter.h | 2 +- src/plugins/ctf/fs-sink/fs-sink.c | 6 +++--- src/plugins/ctf/lttng-live/lttng-live.c | 2 +- src/plugins/lttng-utils/debug-info/bin-info.c | 2 +- src/plugins/lttng-utils/debug-info/debug-info.c | 2 +- .../python-plugin-provider.c | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/doc/api/libbabeltrace2/dox/api-fund.dox b/doc/api/libbabeltrace2/dox/api-fund.dox index f8026b29..8c60e539 100644 --- a/doc/api/libbabeltrace2/dox/api-fund.dox +++ b/doc/api/libbabeltrace2/dox/api-fund.dox @@ -473,7 +473,7 @@ lead to the error, possibly across many \bt_p_plugin written by different developers. An error cause contains information about the source location where the -error occured, the actor involved in the error, and a message. +error occurred, the actor involved in the error, and a message. When you "catch" an error, that is, react to a function returning an error status code without returning an error status code yourself, diff --git a/doc/man/babeltrace2-filter.lttng-utils.debug-info.7.txt b/doc/man/babeltrace2-filter.lttng-utils.debug-info.7.txt index 090d07bd..f98c7d7c 100644 --- a/doc/man/babeltrace2-filter.lttng-utils.debug-info.7.txt +++ b/doc/man/babeltrace2-filter.lttng-utils.debug-info.7.txt @@ -62,7 +62,7 @@ Example: `load_user_config+0x194`. [[field-src]]`src` vtype:[string]:: Source file path or name followed with `:LINE`, where `LINE` is the - line number in this source file at which the event occured. + line number in this source file at which the event occurred. + Example: `user-config.c:1025`. @@ -97,7 +97,7 @@ In this case, the events that the message iterator creates do not contain the source file and line number (see the <>), but only the name of the nearest function symbol with an offset in bytes to the location in the executable from which the LTTng -event occured (see the <>). +event occurred (see the <>). If the executable file has neither ELF symbols nor DWARF information, the {compcls} message iterator cannot map the event to its source diff --git a/doc/man/babeltrace2-sink.ctf.fs.7.txt b/doc/man/babeltrace2-sink.ctf.fs.7.txt index 1e445b63..df913414 100644 --- a/doc/man/babeltrace2-sink.ctf.fs.7.txt +++ b/doc/man/babeltrace2-sink.ctf.fs.7.txt @@ -54,7 +54,7 @@ field. In all the cases above, the component adds a comment in the metadata stream, above the field class, to indicate that a special translation -occured. +occurred. === Input message constraints diff --git a/include/babeltrace2/graph/message-iterator-class.h b/include/babeltrace2/graph/message-iterator-class.h index e668a515..df6053d5 100644 --- a/include/babeltrace2/graph/message-iterator-class.h +++ b/include/babeltrace2/graph/message-iterator-class.h @@ -171,7 +171,7 @@ The available message iterator class methods to implement are:
Called to check whether or not your \bt_msg_iter can currently - seek a message occuring at or after a specific time given in + seek a message occurring at or after a specific time given in nanoseconds from its \ref api-tir-clock-cls-origin "clock class origin". @@ -187,7 +187,7 @@ The available message iterator class methods to implement are: If you don't implement this method, then, if you implement the \ref api-msg-iter-cls-meth-seek-ns "seek ns from origin" method, the library assumes that your message iterator can always seek any - message occuring at or after any time. + message occurring at or after any time. The message iterator of a \bt_flt_comp will typically consider the time seeking capability of its own upstream message @@ -195,7 +195,7 @@ The available message iterator class methods to implement are: this method's implementation. If you need to block the thread to compute whether or not your - message iterator can seek a message occuring at or after a given + message iterator can seek a message occurring at or after a given time, you can instead report to try again later to the caller by returning #BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_AGAIN. @@ -266,7 +266,7 @@ The available message iterator class methods to implement are: bt_message_iterator_seek_ns_from_origin() uses this configuration option and the beginning seeking capability of a message iterator (bt_message_iterator_can_seek_beginning()) - to make it seek a message occuring at or after a specific time even + to make it seek a message occurring at or after a specific time even when the message iterator does not implement the \ref api-msg-iter-cls-meth-seek-ns "seek ns from origin" method. @@ -417,7 +417,7 @@ The available message iterator class methods to implement are:
Called within bt_message_iterator_seek_ns_from_origin() to make - your message iterator seek a message occuring at or after a specific + your message iterator seek a message occurring at or after a specific time given in nanoseconds from its \ref api-tir-clock-cls-origin "clock class origin". @@ -465,7 +465,7 @@ The available message iterator class methods to implement are: later. If you need to block the thread to make your message iterator seek a - message occuring at or after a given time, you can instead report to + message occurring at or after a given time, you can instead report to try again later to the caller by returning #BT_MESSAGE_ITERATOR_CLASS_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_AGAIN. @@ -620,7 +620,7 @@ method. @param[out] can_seek_ns_from_origin On success, set \bt_p{*can_seek_ns_from_origin} to #BT_TRUE if \bt_p{self_message_iterator} can currently seek a - message occuring at or after \bt_p{ns_from_origin} nanoseconds from + message occurring at or after \bt_p{ns_from_origin} nanoseconds from its \ref api-tir-clock-cls-origin "clock class origin". @retval #BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_NS_FROM_ORIGIN_METHOD_STATUS_OK diff --git a/include/babeltrace2/graph/message-iterator.h b/include/babeltrace2/graph/message-iterator.h index cda5040a..4a6913fb 100644 --- a/include/babeltrace2/graph/message-iterator.h +++ b/include/babeltrace2/graph/message-iterator.h @@ -162,7 +162,7 @@ operations:
\anchor api-msg-iter-op-seek-ns - Make the message iterator seek a message occuring at or after a + Make the message iterator seek a message occurring at or after a given time (in nanoseconds) from its clock class origin
@@ -645,7 +645,7 @@ typedef enum bt_message_iterator_can_seek_ns_from_origin_status { /*! @brief Returns whether or not the message iterator \bt_p{message_iterator} - can currently seek a \bt_msg occuring at or after + can currently seek a \bt_msg occurring at or after \bt_p{ns_from_origin} nanoseconds from its \ref api-tir-clock-cls-origin "clock class origin". @@ -663,7 +663,7 @@ call bt_message_iterator_seek_ns_from_origin(). Requested time point to seek. @param[out] can_seek_ns_from_origin On success, \bt_p{*can_seek_ns_from_origin} is - #BT_TRUE if \bt_p{message_iterator} can seek a message occuring at + #BT_TRUE if \bt_p{message_iterator} can seek a message occurring at or after \bt_p{ns_from_origin} nanoseconds from its clock class origin. @@ -680,7 +680,7 @@ call bt_message_iterator_seek_ns_from_origin(). @bt_pre_not_null{can_seek_ns_from_origin} @sa bt_message_iterator_seek_ns_from_origin() — - Makes a message iterator seek a message occuring at or after + Makes a message iterator seek a message occurring at or after a given time from its clock class origin. */ @@ -722,7 +722,7 @@ typedef enum bt_message_iterator_seek_ns_from_origin_status { /*! @brief Makes the message iterator \bt_p{message_iterator} seek a \bt_msg - occuring at or after \bt_p{ns_from_origin} nanoseconds from its + occurring at or after \bt_p{ns_from_origin} nanoseconds from its \ref api-tir-clock-cls-origin "clock class origin". See \ref api-msg-iter-op-seek-ns "this operation's documentation". @@ -732,7 +732,7 @@ without performing any other \ref api-msg-iter-ops "operation" on \bt_p{message_iterator}, before you call this function. @param[in] message_iterator - Message iterator to seek to a message occuring at or after + Message iterator to seek to a message occurring at or after \bt_p{ns_from_origin} nanoseconds from its clock class origin. @param[in] ns_from_origin Time point to seek. @@ -753,7 +753,7 @@ without performing any other \ref api-msg-iter-ops "operation" on @sa bt_message_iterator_can_seek_ns_from_origin() — Returns whether or not a message iterator can currently seek a - message occuring at or after a given time from its clock class + message occurring at or after a given time from its clock class origin. */ extern bt_message_iterator_seek_ns_from_origin_status diff --git a/include/babeltrace2/trace-ir/clock-class.h b/include/babeltrace2/trace-ir/clock-class.h index 4fbbf533..f0685e39 100644 --- a/include/babeltrace2/trace-ir/clock-class.h +++ b/include/babeltrace2/trace-ir/clock-class.h @@ -70,7 +70,7 @@ In the illustration above, notice that: stream's default clock. In other words, a default clock snapshot contains the value of the - stream's default clock when this message occured. + stream's default clock when this message occurred. The default clock class property of a \bt_stream_cls is optional: if a stream class has no default clock class, then its instances diff --git a/include/babeltrace2/trace-ir/clock-snapshot.h b/include/babeltrace2/trace-ir/clock-snapshot.h index 23d86781..49cffe2b 100644 --- a/include/babeltrace2/trace-ir/clock-snapshot.h +++ b/include/babeltrace2/trace-ir/clock-snapshot.h @@ -67,7 +67,7 @@ In the illustration above, notice that: of the stream's default clock. In other words, a default clock snapshot contains the value of the - stream's default clock when this message occured. + stream's default clock when this message occurred. A clock snapshot is a \ref api-fund-unique-object "unique object": it belongs to a \bt_msg. diff --git a/include/babeltrace2/trace-ir/stream.h b/include/babeltrace2/trace-ir/stream.h index 32bc98e1..3f396e32 100644 --- a/include/babeltrace2/trace-ir/stream.h +++ b/include/babeltrace2/trace-ir/stream.h @@ -69,7 +69,7 @@ which can belong to different streams, as long as the stream clocks are \ref api-tir-clock-cls-origin "correlatable". A typical use case for streams is to use one for each traced CPU. Then -the messages related to a given stream are the ones which occured on a +the messages related to a given stream are the ones which occurred on a given CPU. Other schemes are possible: they are completely application-specific, and \bt_name does not enforce any specific stream arrangement pattern. @@ -105,7 +105,7 @@ In the illustration above, notice that: stream's default clock. In other words, a default clock snapshot contains the value of the - stream's default clock when this message occured. + stream's default clock when this message occurred. To create a stream: diff --git a/src/argpar/argpar.c b/src/argpar/argpar.c index b8b7c630..ad56838f 100644 --- a/src/argpar/argpar.c +++ b/src/argpar/argpar.c @@ -604,7 +604,7 @@ struct argpar_parse_ret argpar_parse(unsigned int argc, goto end; error: - /* That's how we indicate that an error occured */ + /* That's how we indicate that an error occurred */ destroy_item_array(parse_ret.items); parse_ret.items = NULL; diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.h b/src/plugins/ctf/common/msg-iter/msg-iter.h index 73bb121e..8774b366 100644 --- a/src/plugins/ctf/common/msg-iter/msg-iter.h +++ b/src/plugins/ctf/common/msg-iter/msg-iter.h @@ -164,7 +164,7 @@ struct ctf_msg_iter_medium_ops { * #CTF_MSG_ITER_MEDIUM_STATUS_EOF on the \em following * call. * - #CTF_MSG_ITER_MEDIUM_STATUS_ERROR: A fatal - * error occured during this operation. In this case, the + * error occurred during this operation. In this case, the * message iterator function called by the user returns * #CTF_MSG_ITER_STATUS_ERROR. * diff --git a/src/plugins/ctf/fs-sink/fs-sink.c b/src/plugins/ctf/fs-sink/fs-sink.c index 2cfc2048..20b33471 100644 --- a/src/plugins/ctf/fs-sink/fs-sink.c +++ b/src/plugins/ctf/fs-sink/fs-sink.c @@ -466,7 +466,7 @@ bt_component_class_sink_consume_method_status handle_packet_beginning_msg( */ if (stream->prev_packet_state.end_cs == UINT64_C(-1)) { BT_COMP_LOGE("Incompatible discarded packets message " - "occuring before the stream's first packet: " + "occurring before the stream's first packet: " "stream-id=%" PRIu64 ", stream-name=\"%s\", " "trace-name=\"%s\", path=\"%s/%s\"", bt_stream_get_id(ir_stream), @@ -645,7 +645,7 @@ bt_component_class_sink_consume_method_status handle_stream_beginning_msg( /* * Not supported: discarded events or discarded packets support * without packets support. Packets are the way to know where - * discarded events/packets occured in CTF 1.8. + * discarded events/packets occurred in CTF 1.8. */ if (!bt_stream_class_supports_packets(ir_sc)) { BT_ASSERT(!bt_stream_class_supports_discarded_packets(ir_sc)); @@ -820,7 +820,7 @@ bt_component_class_sink_consume_method_status handle_discarded_events_msg( if (stream->packet_state.is_open && stream->sc->discarded_events_has_ts) { BT_COMP_LOGE("Unsupported discarded events message with " - "default clock snapshots occuring within a packet: " + "default clock snapshots occurring within a packet: " "stream-id=%" PRIu64 ", stream-name=\"%s\", " "trace-name=\"%s\", path=\"%s/%s\"", bt_stream_get_id(ir_stream), diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c index bef21b09..66e20b73 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.c +++ b/src/plugins/ctf/lttng-live/lttng-live.c @@ -1065,7 +1065,7 @@ enum lttng_live_iterator_status next_stream_iterator_for_trace( /* * Check if the message of the current live stream - * iterator occured at the exact same time or after the + * iterator occurred at the exact same time or after the * last message returned by this component's message * iterator. If not, we return an error. */ diff --git a/src/plugins/lttng-utils/debug-info/bin-info.c b/src/plugins/lttng-utils/debug-info/bin-info.c index b9e92871..dcb54315 100644 --- a/src/plugins/lttng-utils/debug-info/bin-info.c +++ b/src/plugins/lttng-utils/debug-info/bin-info.c @@ -300,7 +300,7 @@ end: * * @returns 1 on if the build id of stored in `bin` matches * the build id of the ondisk file. - * 0 on if they are different or an error occured. + * 0 on if they are different or an error occurred. */ static int is_build_id_matching(struct bin_info *bin) diff --git a/src/plugins/lttng-utils/debug-info/debug-info.c b/src/plugins/lttng-utils/debug-info/debug-info.c index 36af5aa2..39e59db4 100644 --- a/src/plugins/lttng-utils/debug-info/debug-info.c +++ b/src/plugins/lttng-utils/debug-info/debug-info.c @@ -213,7 +213,7 @@ struct debug_info_source *debug_info_source_create_from_bin( g_strdup_printf("%"PRId64, src_loc->line_no); if (!debug_info_src->line_no) { BT_COMP_LOGE_APPEND_CAUSE(self_comp, - "Error occured when setting `line_no` field."); + "Error occurred when setting `line_no` field."); goto error; } diff --git a/src/python-plugin-provider/python-plugin-provider.c b/src/python-plugin-provider/python-plugin-provider.c index 5d8d8b65..c1cd399e 100644 --- a/src/python-plugin-provider/python-plugin-provider.c +++ b/src/python-plugin-provider/python-plugin-provider.c @@ -104,7 +104,7 @@ void log_python_traceback(int log_level) } BT_LOG_WRITE(log_level, BT_LOG_TAG, - "Exception occured: Python traceback:\n%s", exc->str); + "Exception occurred: Python traceback:\n%s", exc->str); } end: -- 2.34.1