1d037ca164
perf defines both __used and __unused variables to use for marking
unused variables. The variable __used is defined to
__attribute__((__unused__)), which contradicts the kernel definition to
__attribute__((__used__)) for new gcc versions. On Android, __used is
also defined in system headers and this leads to warnings like: warning:
'__used__' attribute ignored
__unused is not defined in the kernel and is not a standard definition.
If __unused is included everywhere instead of __used, this leads to
conflicts with glibc headers, since glibc has a variables with this name
in its headers.
The best approach is to use __maybe_unused, the definition used in the
kernel for __attribute__((unused)). In this way there is only one
definition in perf sources (instead of 2 definitions that point to the
same thing: __used and __unused) and it works on both Linux and Android.
This patch simply replaces all instances of __used and __unused with
__maybe_unused.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1347315303-29906-7-git-send-email-irina.tirdea@intel.com
[ committer note: fixed up conflict with a116e05 in builtin-sched.c ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
125 lines
2.6 KiB
C
125 lines
2.6 KiB
C
#include "../util.h"
|
|
#include "../../util/debug.h"
|
|
#include "gtk.h"
|
|
|
|
#include <string.h>
|
|
|
|
|
|
struct perf_gtk_context *pgctx;
|
|
|
|
struct perf_gtk_context *perf_gtk__activate_context(GtkWidget *window)
|
|
{
|
|
struct perf_gtk_context *ctx;
|
|
|
|
ctx = malloc(sizeof(*pgctx));
|
|
if (ctx)
|
|
ctx->main_window = window;
|
|
|
|
return ctx;
|
|
}
|
|
|
|
int perf_gtk__deactivate_context(struct perf_gtk_context **ctx)
|
|
{
|
|
if (!perf_gtk__is_active_context(*ctx))
|
|
return -1;
|
|
|
|
free(*ctx);
|
|
*ctx = NULL;
|
|
return 0;
|
|
}
|
|
|
|
static int perf_gtk__error(const char *format, va_list args)
|
|
{
|
|
char *msg;
|
|
GtkWidget *dialog;
|
|
|
|
if (!perf_gtk__is_active_context(pgctx) ||
|
|
vasprintf(&msg, format, args) < 0) {
|
|
fprintf(stderr, "Error:\n");
|
|
vfprintf(stderr, format, args);
|
|
fprintf(stderr, "\n");
|
|
return -1;
|
|
}
|
|
|
|
dialog = gtk_message_dialog_new_with_markup(GTK_WINDOW(pgctx->main_window),
|
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
|
GTK_MESSAGE_ERROR,
|
|
GTK_BUTTONS_CLOSE,
|
|
"<b>Error</b>\n\n%s", msg);
|
|
gtk_dialog_run(GTK_DIALOG(dialog));
|
|
|
|
gtk_widget_destroy(dialog);
|
|
free(msg);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef HAVE_GTK_INFO_BAR
|
|
static int perf_gtk__warning_info_bar(const char *format, va_list args)
|
|
{
|
|
char *msg;
|
|
|
|
if (!perf_gtk__is_active_context(pgctx) ||
|
|
vasprintf(&msg, format, args) < 0) {
|
|
fprintf(stderr, "Warning:\n");
|
|
vfprintf(stderr, format, args);
|
|
fprintf(stderr, "\n");
|
|
return -1;
|
|
}
|
|
|
|
gtk_label_set_text(GTK_LABEL(pgctx->message_label), msg);
|
|
gtk_info_bar_set_message_type(GTK_INFO_BAR(pgctx->info_bar),
|
|
GTK_MESSAGE_WARNING);
|
|
gtk_widget_show(pgctx->info_bar);
|
|
|
|
free(msg);
|
|
return 0;
|
|
}
|
|
#else
|
|
static int perf_gtk__warning_statusbar(const char *format, va_list args)
|
|
{
|
|
char *msg, *p;
|
|
|
|
if (!perf_gtk__is_active_context(pgctx) ||
|
|
vasprintf(&msg, format, args) < 0) {
|
|
fprintf(stderr, "Warning:\n");
|
|
vfprintf(stderr, format, args);
|
|
fprintf(stderr, "\n");
|
|
return -1;
|
|
}
|
|
|
|
gtk_statusbar_pop(GTK_STATUSBAR(pgctx->statbar),
|
|
pgctx->statbar_ctx_id);
|
|
|
|
/* Only first line can be displayed */
|
|
p = strchr(msg, '\n');
|
|
if (p)
|
|
*p = '\0';
|
|
|
|
gtk_statusbar_push(GTK_STATUSBAR(pgctx->statbar),
|
|
pgctx->statbar_ctx_id, msg);
|
|
|
|
free(msg);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
struct perf_error_ops perf_gtk_eops = {
|
|
.error = perf_gtk__error,
|
|
#ifdef HAVE_GTK_INFO_BAR
|
|
.warning = perf_gtk__warning_info_bar,
|
|
#else
|
|
.warning = perf_gtk__warning_statusbar,
|
|
#endif
|
|
};
|
|
|
|
/*
|
|
* FIXME: Functions below should be implemented properly.
|
|
* For now, just add stubs for NO_NEWT=1 build.
|
|
*/
|
|
#ifdef NO_NEWT_SUPPORT
|
|
void ui_progress__update(u64 curr __maybe_unused, u64 total __maybe_unused,
|
|
const char *title __maybe_unused)
|
|
{
|
|
}
|
|
#endif
|