void fdi_free(struct fd_info *fdi);
void fdi_array_free(struct fd_info ***arr);
bool fdi_has_log(struct fd_info *fdi);
-int fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, write_callback callback, void *userdata, log_filter *filter);
+int fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, log_filter *filter);
struct logger_entry *fdi_extract_entry(struct fd_info *fdi);
int fdi_read(struct fd_info *fdi);
void logfile_do_rotate(struct log_file *file);
int logfile_write_with_rotation(const struct logger_entry *e, struct log_file *file, enum dlogutil_sorting_order sort_by);
-typedef int write_callback(const struct logger_entry *e, void *userdata);
+typedef int dlogutil_write_callback(const struct logger_entry *e, void *userdata);
struct logfile_callback_data
{
void additional_options_cleanup(struct additional_options *opt);
int create_initial_fdis(struct fd_info ***fdis, int enabled_buffers, bool is_pipe, const struct log_config *conf);
-int do_print(struct fd_info **data_fds, int fd_count, write_callback callback, void *userdata, bool sorting_needed, enum dlogutil_sorting_order sort_by, const struct log_config *conf, struct additional_options *opt);
+int do_print(struct fd_info **data_fds, int fd_count, dlogutil_write_callback callback, void *userdata, bool sorting_needed, enum dlogutil_sorting_order sort_by, const struct log_config *conf, struct additional_options *opt);
int sort_vector_used_size(struct sort_vector *logs);
void sort_vector_pop(struct sort_vector *logs);
void sort_vector_apply_config(struct sort_vector *logs, const struct log_config *config);
-int sort_vector_push(struct sort_vector *logs, struct logger_entry *p, write_callback callback, void *userdata);
+int sort_vector_push(struct sort_vector *logs, struct logger_entry *p, dlogutil_write_callback callback, void *userdata);
long sort_vector_time_span(struct sort_vector *logs);
-int sort_vector_flush(struct sort_vector *logs, write_callback callback, void *userdata, bool force);
+int sort_vector_flush(struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, bool force);
free(*arr);
}
-int fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, write_callback callback, void *userdata, log_filter *filter)
+int fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, log_filter *filter)
{
assert(fdi);
assert(userdata);
return best_fdi;
}
-int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, struct sort_vector *logs, write_callback callback, void *userdata, log_filter *filter)
+int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, log_filter *filter)
{
assert(data_fds);
assert(logs);
* @param[in] l_file File output metadata
* @return int 0 if successful, a negative value on error, callback's return value if it isn't 0
*/
-int do_print(struct fd_info **data_fds, int fd_count, write_callback callback, void *userdata, bool sorting_needed, enum dlogutil_sorting_order sort_by, const struct log_config *conf, struct additional_options *opt)
+int do_print(struct fd_info **data_fds, int fd_count, dlogutil_write_callback callback, void *userdata, bool sorting_needed, enum dlogutil_sorting_order sort_by, const struct log_config *conf, struct additional_options *opt)
{
assert(data_fds);
assert(userdata);
* @param[in] logs Log sorting vector
* @return 0 on success, -errno on failure
*/
-int sort_vector_push(struct sort_vector *logs, struct logger_entry *p, write_callback callback, void *userdata)
+int sort_vector_push(struct sort_vector *logs, struct logger_entry *p, dlogutil_write_callback callback, void *userdata)
{
assert(logs);
assert(logs->data);
* @param[out] callback_ret Return value of the callback if it has been called
* @return bool whether the log was old enough
*/
-bool process_log(const struct logger_entry *e, struct timespec reference_ts, enum dlogutil_sorting_order stamp_type, write_callback callback, void *userdata, long timeout, int *callback_ret)
+bool process_log(const struct logger_entry *e, struct timespec reference_ts, enum dlogutil_sorting_order stamp_type, dlogutil_write_callback callback, void *userdata, long timeout, int *callback_ret)
{
assert(e);
assert(userdata);
return true;
}
-int sort_vector_flush(struct sort_vector *logs, write_callback callback, void *userdata, bool force)
+int sort_vector_flush(struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, bool force)
{
struct timespec ts;
clock_gettime(get_proper_clock(logs->sort_by), &ts);
static bool sv_pushed;
static int sv_push_retval;
-int __wrap_sort_vector_push(struct sort_vector *logs, struct logger_entry *p, write_callback comp_callback, void *userdata)
+int __wrap_sort_vector_push(struct sort_vector *logs, struct logger_entry *p, dlogutil_write_callback comp_callback, void *userdata)
{
assert(p == (struct logger_entry *) 0xBADFEEL);
assert(comp_callback == callback);
#include <sort_vector.h>
#include <fd_info.h>
-bool process_log(const struct logger_entry *e, struct timespec reference_ts, enum dlogutil_sorting_order stamp_type, write_callback callback, void *userdata, long timeout, int *callback_ret);
+bool process_log(const struct logger_entry *e, struct timespec reference_ts, enum dlogutil_sorting_order stamp_type, dlogutil_write_callback callback, void *userdata, long timeout, int *callback_ret);
struct fd_info *find_earliest_log(struct fd_info **data_fds, int fd_count, enum dlogutil_sorting_order sort_by);
-int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, struct sort_vector *logs, write_callback callback, void *userdata, log_filter *filter);
+int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, log_filter *filter);
int validate_buffers(int *enabled_buffers);
int written_logs = 0;
}
int fdi_push_log_ret = 0;
-int __wrap_fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, write_callback callback, void *userdata, log_filter *filter)
+int __wrap_fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, log_filter *filter)
{
assert(filter == (log_filter *)0xEEE);
if (fdi_push_log_ret != 0)