From: Hyotaek Shim Date: Mon, 4 May 2020 06:15:56 +0000 (+0000) Subject: Revert "Revert "Move some more getters around"" X-Git-Tag: submit/tizen/20200506.124304~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F232391%2F2;p=platform%2Fcore%2Fsystem%2Fdlog.git Revert "Revert "Move some more getters around"" This reverts commit 146458f9b77c55345efbb3419ee82e423c66e993. Change-Id: I20602b26aa154a277a6735209036edb658a42569 --- diff --git a/Makefile.am b/Makefile.am index 07e777a..7929dc1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,7 +149,7 @@ dlogsend_LDADD = \ dlogsend_SOURCES = \ src/shared/ptrs_list.c \ - src/shared/logprint.c \ + src/shared/queued_entry_timestamp.c \ src/shared/logcommon.c \ src/logsend/logsend.c @@ -373,15 +373,15 @@ src_tests_fdi_logger_neg_SOURCES = src/tests/fdi_logger_neg.c src/libdlogutil/fd src_tests_fdi_logger_neg_CFLAGS = $(check_CFLAGS) src_tests_fdi_logger_neg_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=logger_open_buffer_from_config_get_path,--wrap=dlogutil_filter_options_set_filterspec,--wrap=parse_androidlogger_message,--wrap=copy_recv_timestamp,--wrap=malloc,--wrap=read,--wrap=close,--wrap=ioctl,--wrap=calloc -src_tests_fdi_pipe_pos_SOURCES = src/tests/fdi_pipe_pos.c src/libdlogutil/fdi_pipe.c src/shared/logconfig.c src/shared/ptrs_list.c src/shared/logprint.c src/shared/parsers.c src/shared/logcommon.c +src_tests_fdi_pipe_pos_SOURCES = src/tests/fdi_pipe_pos.c src/libdlogutil/fdi_pipe.c src/shared/logconfig.c src/shared/ptrs_list.c src/shared/logprint.c src/shared/parsers.c src/shared/logcommon.c src/shared/queued_entry_timestamp.c src_tests_fdi_pipe_pos_CFLAGS = $(check_CFLAGS) src_tests_fdi_pipe_pos_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=connect_sock,--wrap=close,--wrap=malloc,--wrap=free,--wrap=send_dlog_request,--wrap=recv_dlog_reply,--wrap=read,--wrap=recv_pipe -src_tests_fdi_pipe_neg_SOURCES = src/tests/fdi_pipe_neg.c src/libdlogutil/fdi_pipe.c src/shared/logconfig.c src/shared/ptrs_list.c src/shared/logprint.c src/shared/parsers.c src/shared/logcommon.c +src_tests_fdi_pipe_neg_SOURCES = src/tests/fdi_pipe_neg.c src/libdlogutil/fdi_pipe.c src/shared/logconfig.c src/shared/ptrs_list.c src/shared/logprint.c src/shared/parsers.c src/shared/logcommon.c src/shared/queued_entry_timestamp.c src_tests_fdi_pipe_neg_CFLAGS = $(check_CFLAGS) src_tests_fdi_pipe_neg_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=connect_sock,--wrap=close,--wrap=malloc,--wrap=free,--wrap=send_dlog_request,--wrap=recv_dlog_reply,--wrap=read,--wrap=recv_pipe -src_tests_libdlog_pipe_SOURCES = src/tests/libdlog_pipe.c src/libdlog/log_pipe.c src/shared/logcommon.c src/shared/logconfig.c src/shared/queued_entry.c src/shared/translate_syslog.c src/shared/parsers.c +src_tests_libdlog_pipe_SOURCES = src/tests/libdlog_pipe.c src/libdlog/log_pipe.c src/shared/logcommon.c src/shared/logconfig.c src/shared/queued_entry.c src/shared/translate_syslog.c src/shared/parsers.c src/shared/queued_entry_timestamp.c src_tests_libdlog_pipe_CFLAGS = $(check_CFLAGS) -pthread src_tests_libdlog_pipe_LDFLAGS = $(AM_LDFLAGS) -lpthread -Wl,--wrap=syslog_critical_failure,--wrap=connect,--wrap=write,--wrap=recv_pipe,--wrap=dup2,--wrap=socket,--wrap=close -lm @@ -433,7 +433,7 @@ src_tests_config_SOURCES = src/tests/config.c src/shared/logconfig.c src/shared/ src_tests_config_CFLAGS = $(check_CFLAGS) src_tests_config_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=openat64,--wrap=openat,--wrap=scandirat,--wrap=scandirat64,--wrap=fdopen,--wrap=fdopen64,--wrap=open,--wrap=open64,--wrap=calloc -src_tests_logprint_SOURCES = src/tests/logprint.c src/shared/ptrs_list.c src/shared/logprint.c src/shared/logcommon.c src/shared/queued_entry.c src/shared/parsers.c src/shared/translate_syslog.c +src_tests_logprint_SOURCES = src/tests/logprint.c src/shared/ptrs_list.c src/shared/logprint.c src/shared/logcommon.c src/shared/queued_entry.c src/shared/parsers.c src/shared/translate_syslog.c src/shared/queued_entry_timestamp.c src_tests_logprint_CFLAGS = $(check_CFLAGS) src_tests_logprint_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=write,--wrap=malloc,--wrap=calloc,--wrap=localtime,--wrap=strdup,--wrap=strndup,--wrap=list_add @@ -465,8 +465,8 @@ src_tests_logutil_LDFLAGS = $(AM_LDFLAGS) -lcap -Wl,--wrap=clock_gettime,--wrap= src_tests_kmsg_parser_pos_SOURCES = src/tests/kmsg_parser_pos.c \ src/shared/logcommon.c \ src/shared/queued_entry.c \ + src/shared/queued_entry_timestamp.c \ src/shared/ptrs_list.c \ - src/shared/logprint.c \ src/shared/parsers.c \ src/shared/translate_syslog.c src_tests_kmsg_parser_pos_CFLAGS = $(check_CFLAGS) @@ -475,8 +475,8 @@ src_tests_kmsg_parser_pos_LDFLAGS = $(AM_LDFLAGS) src_tests_kmsg_parser_neg_SOURCES = src/tests/kmsg_parser_neg.c \ src/shared/logcommon.c \ src/shared/queued_entry.c \ + src/shared/queued_entry_timestamp.c \ src/shared/ptrs_list.c \ - src/shared/logprint.c \ src/shared/parsers.c \ src/shared/translate_syslog.c src_tests_kmsg_parser_neg_CFLAGS = $(check_CFLAGS) @@ -485,8 +485,8 @@ src_tests_kmsg_parser_neg_LDFLAGS = $(AM_LDFLAGS) src_tests_syslog_parser_pos_SOURCES = src/tests/syslog_parser_pos.c \ src/shared/logcommon.c \ src/shared/queued_entry.c \ + src/shared/queued_entry_timestamp.c \ src/shared/ptrs_list.c \ - src/shared/logprint.c \ src/shared/parsers.c \ src/shared/translate_syslog.c src_tests_syslog_parser_pos_CFLAGS = $(check_CFLAGS) @@ -495,8 +495,8 @@ src_tests_syslog_parser_pos_LDFLAGS = $(AM_LDFLAGS) src_tests_syslog_parser_neg_SOURCES = src/tests/syslog_parser_neg.c \ src/shared/logcommon.c \ src/shared/queued_entry.c \ + src/shared/queued_entry_timestamp.c \ src/shared/ptrs_list.c \ - src/shared/logprint.c \ src/shared/parsers.c \ src/shared/translate_syslog.c src_tests_syslog_parser_neg_CFLAGS = $(check_CFLAGS) @@ -526,7 +526,7 @@ src_tests_critical_log_SOURCES = src/tests/critical_log.c \ src_tests_critical_log_CFLAGS = $(check_CFLAGS) -pthread src_tests_critical_log_LDFLAGS = $(AM_LDFLAGS) -lpthread -Wl,--wrap=execv,--wrap=clock_gettime -src_tests_filters_SOURCES = src/tests/filters.c src/shared/ptrs_list.c src/shared/logcommon.c src/shared/logprint.c +src_tests_filters_SOURCES = src/tests/filters.c src/shared/ptrs_list.c src/shared/logcommon.c src/shared/logprint.c src/shared/queued_entry_timestamp.c src_tests_filters_CFLAGS = $(check_CFLAGS) src_tests_filters_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/shared/logprint.c b/src/shared/logprint.c index 967e7f2..69284d0 100644 --- a/src/shared/logprint.c +++ b/src/shared/logprint.c @@ -487,56 +487,6 @@ LIBDLOGUTIL_EXPORT_API int dlogutil_filter_options_set_tid(dlogutil_filter_optio return list_add(&p_filter->filters, p_fi) ? TIZEN_ERROR_NONE : TIZEN_ERROR_OUT_OF_MEMORY; } -/** - * @brief Return pointer to log entry tag - * @details Finds the beginning of a log tag in entry's payload and returns it - * @param[in] entry The log entry - * @param[out] tag The log tag - * @return An error code - * @retval TIZEN_ERROR_NONE Success - * @retval TIZEN_ERROR_INVALID_PARAMETER One of the pointers was NULL - * @retval TIZEN_ERROR_NO_DATA No valid tag was found - */ -LIBDLOGUTIL_EXPORT_API int dlogutil_entry_get_tag(const dlogutil_entry_s *entry, const char **tag) -{ - CHECK_PARAM(entry); - CHECK_PARAM(tag); - - if (entry->len - (int) sizeof(dlogutil_entry_s) < 2 - || ((const char *)entry)[entry->len - 1] != '\0') { - *tag = NULL; - return TIZEN_ERROR_NO_DATA; - } - - *tag = entry->msg; - return TIZEN_ERROR_NONE; -} - -/** - * @brief Return pointer to log entry message - * @details Finds the beginning of a log message in entry's payload and returns it - * @param[in] entry The log entry - * @param[out] msg The log message - * @return An error code - * @retval TIZEN_ERROR_NONE Success - * @retval TIZEN_ERROR_INVALID_PARAMETER One of the pointers was NULL - * @retval TIZEN_ERROR_NO_DATA No valid message was found - */ -LIBDLOGUTIL_EXPORT_API int dlogutil_entry_get_message(const dlogutil_entry_s *entry, const char **msg) -{ - CHECK_PARAM(entry); - CHECK_PARAM(msg); - - if (entry->len - (int) sizeof(dlogutil_entry_s) < 2 - || ((const char *)entry)[entry->len - 1] != '\0') { - *msg = NULL; - return TIZEN_ERROR_NO_DATA; - } - - *msg = entry->msg + entry->tag_len + 1 /* NULL delimiter */; - return TIZEN_ERROR_NONE; -} - dlogutil_sorting_order_e get_format_sorting(log_print_format format) { switch (format) { diff --git a/src/shared/queued_entry_timestamp.c b/src/shared/queued_entry_timestamp.c index 2ca9d8b..5b13e92 100644 --- a/src/shared/queued_entry_timestamp.c +++ b/src/shared/queued_entry_timestamp.c @@ -179,3 +179,33 @@ LIBDLOGUTIL_EXPORT_API int dlogutil_entry_get_priority(const dlogutil_entry_s *e return TIZEN_ERROR_NONE; } +LIBDLOGUTIL_EXPORT_API int dlogutil_entry_get_tag(const dlogutil_entry_s *entry, const char **tag) +{ + CHECK_PARAM(entry); + CHECK_PARAM(tag); + + if (entry->len - (int) sizeof(dlogutil_entry_s) < 2 + || ((const char *)entry)[entry->len - 1] != '\0') { + *tag = NULL; + return TIZEN_ERROR_NO_DATA; + } + + *tag = entry->msg; + return TIZEN_ERROR_NONE; +} + +LIBDLOGUTIL_EXPORT_API int dlogutil_entry_get_message(const dlogutil_entry_s *entry, const char **msg) +{ + CHECK_PARAM(entry); + CHECK_PARAM(msg); + + if (entry->len - (int) sizeof(dlogutil_entry_s) < 2 + || ((const char *)entry)[entry->len - 1] != '\0') { + *msg = NULL; + return TIZEN_ERROR_NO_DATA; + } + + *msg = entry->msg + entry->tag_len + 1 /* NULL delimiter */; + return TIZEN_ERROR_NONE; +} +