llapi_msg_level = level;
}
-/* llapi_error will preserve errno */
-void llapi_error(int level, int _rc, const char *fmt, ...)
+static void error_callback_default(enum llapi_message_level level, int err,
+ const char *fmt, va_list ap)
+{
+ vfprintf(stderr, fmt, ap);
+ if (level & LLAPI_MSG_NO_ERRNO)
+ fprintf(stderr, "\n");
+ else
+ fprintf(stderr, ": %s (%d)\n", strerror(err), err);
+}
+
+static void info_callback_default(enum llapi_message_level level, int err,
+ const char *fmt, va_list ap)
{
- va_list args;
- int tmp_errno = errno;
- /* to protect using errno as _rc argument */
- int rc = abs(_rc);
+ vfprintf(stdout, fmt, ap);
+}
- if ((level & LLAPI_MSG_MASK) > llapi_msg_level)
- return;
+static llapi_log_callback_t llapi_error_callback = error_callback_default;
+static llapi_log_callback_t llapi_info_callback = info_callback_default;
- va_start(args, fmt);
- vfprintf(stderr, fmt, args);
- va_end(args);
- if (level & LLAPI_MSG_NO_ERRNO)
- fprintf(stderr, "\n");
- else
- fprintf(stderr, ": %s (%d)\n", strerror(rc), rc);
- errno = tmp_errno;
+/* llapi_error will preserve errno */
+void llapi_error(enum llapi_message_level level, int err, const char *fmt, ...)
+{
+ va_list args;
+ int tmp_errno = errno;
+
+ if ((level & LLAPI_MSG_MASK) > llapi_msg_level)
+ return;
+
+ va_start(args, fmt);
+ llapi_error_callback(level, abs(err), fmt, args);
+ va_end(args);
+ errno = tmp_errno;
}
/* llapi_printf will preserve errno */
-void llapi_printf(int level, const char *fmt, ...)
+void llapi_printf(enum llapi_message_level level, const char *fmt, ...)
{
- va_list args;
- int tmp_errno = errno;
+ va_list args;
+ int tmp_errno = errno;
+
+ if ((level & LLAPI_MSG_MASK) > llapi_msg_level)
+ return;
+
+ va_start(args, fmt);
+ llapi_info_callback(level, 0, fmt, args);
+ va_end(args);
+ errno = tmp_errno;
+}
- if ((level & LLAPI_MSG_MASK) > llapi_msg_level)
- return;
+/**
+ * Set a custom error logging function. Passing in NULL will reset the logging
+ * callback to its default value.
+ *
+ * This function returns the value of the old callback.
+ */
+llapi_log_callback_t llapi_error_callback_set(llapi_log_callback_t cb)
+{
+ llapi_log_callback_t old = llapi_error_callback;
+
+ if (cb != NULL)
+ llapi_error_callback = cb;
+ else
+ llapi_error_callback = error_callback_default;
+
+ return old;
+}
+
+/**
+ * Set a custom info logging function. Passing in NULL will reset the logging
+ * callback to its default value.
+ *
+ * This function returns the value of the old callback.
+ */
+llapi_log_callback_t llapi_info_callback_set(llapi_log_callback_t cb)
+{
+ llapi_log_callback_t old = llapi_info_callback;
+
+ if (cb != NULL)
+ llapi_info_callback = cb;
+ else
+ llapi_info_callback = info_callback_default;
- va_start(args, fmt);
- vfprintf(stdout, fmt, args);
- va_end(args);
- errno = tmp_errno;
+ return old;
}
/**
int raw, char *pool_name)
{
char *prefix = is_dir ? "" : "lmm_";
- char nl = is_dir ? ' ' : '\n';
+ char *seperator = "";
int rc;
if (is_dir && lmm_oi_seq(&lum->lmm_oi) == FID_SEQ_LOV_DEFAULT) {
&scount, NULL,
NULL);
if (rc == 0)
- llapi_printf(LLAPI_MSG_NORMAL, "%d%c",
- scount, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%d",
+ scount);
else
llapi_error(LLAPI_MSG_ERROR, rc,
"Cannot determine default"
" stripe count.");
} else {
- llapi_printf(LLAPI_MSG_NORMAL, "%d%c",
+ llapi_printf(LLAPI_MSG_NORMAL, "%d",
lum->lmm_stripe_count ==
(typeof(lum->lmm_stripe_count))(-1)
- ? -1 : lum->lmm_stripe_count, nl);
+ ? -1 : lum->lmm_stripe_count);
}
} else {
- llapi_printf(LLAPI_MSG_NORMAL, "%hd%c",
- (__s16)lum->lmm_stripe_count, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%hd",
+ (__s16)lum->lmm_stripe_count);
}
+ seperator = is_dir ? " " : "\n";
}
if (verbose & VERBOSE_SIZE) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", seperator);
if (verbose & ~VERBOSE_SIZE)
llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_size: ",
prefix);
rc = sattr_cache_get_defaults(NULL, path, NULL, &ssize,
NULL);
if (rc == 0)
- llapi_printf(LLAPI_MSG_NORMAL, "%u%c", ssize,
- nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%u", ssize);
else
llapi_error(LLAPI_MSG_ERROR, rc,
"Cannot determine default"
" stripe size.");
} else {
- llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
- lum->lmm_stripe_size, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%u",
+ lum->lmm_stripe_size);
}
+ seperator = is_dir ? " " : "\n";
}
if ((verbose & VERBOSE_LAYOUT) && !is_dir) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", seperator);
if (verbose & ~VERBOSE_LAYOUT)
llapi_printf(LLAPI_MSG_NORMAL, "%spattern: ",
prefix);
- llapi_printf(LLAPI_MSG_NORMAL, "%.x%c", lum->lmm_pattern, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%.x", lum->lmm_pattern);
+ seperator = "\n";
}
if ((verbose & VERBOSE_GENERATION) && !is_dir) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", seperator);
if (verbose & ~VERBOSE_GENERATION)
llapi_printf(LLAPI_MSG_NORMAL, "%slayout_gen: ",
prefix);
- llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
- (int)lum->lmm_layout_gen, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%u",
+ (int)lum->lmm_layout_gen);
+ seperator = "\n";
}
if (verbose & VERBOSE_OFFSET) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", seperator);
if (verbose & ~VERBOSE_OFFSET)
llapi_printf(LLAPI_MSG_NORMAL, "%sstripe_offset: ",
prefix);
if (is_dir)
- llapi_printf(LLAPI_MSG_NORMAL, "%d%c",
+ llapi_printf(LLAPI_MSG_NORMAL, "%d",
lum->lmm_stripe_offset ==
(typeof(lum->lmm_stripe_offset))(-1) ? -1 :
- lum->lmm_stripe_offset, nl);
+ lum->lmm_stripe_offset);
else
- llapi_printf(LLAPI_MSG_NORMAL, "%u%c",
- objects[0].l_ost_idx, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%u",
+ objects[0].l_ost_idx);
+ seperator = is_dir ? " " : "\n";
}
if ((verbose & VERBOSE_POOL) && (pool_name != NULL)) {
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", seperator);
if (verbose & ~VERBOSE_POOL)
llapi_printf(LLAPI_MSG_NORMAL, "%spool: ",
prefix);
- llapi_printf(LLAPI_MSG_NORMAL, "%s%c", pool_name, nl);
+ llapi_printf(LLAPI_MSG_NORMAL, "%s", pool_name);
}
- if (is_dir && (verbose != VERBOSE_OBJID))
+ if (!is_dir || (is_dir && (verbose != VERBOSE_OBJID)))
llapi_printf(LLAPI_MSG_NORMAL, "\n");
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff