All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Lluís Vilanova" <vilanova@ac.upc.edu>
To: qemu-devel@nongnu.org
Cc: "Emilio G. Cota" <cota@braap.org>, Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH 07/13] instrument: Add generic command line library loader
Date: Mon, 24 Jul 2017 20:30:41 +0300	[thread overview]
Message-ID: <150091744146.30739.9284399356256394869.stgit@frigg.lan> (raw)
In-Reply-To: <150091574424.30739.4131793221953168474.stgit@frigg.lan>

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
---
 instrument/Makefile.objs |    1 
 instrument/cmdline.c     |  117 ++++++++++++++++++++++++++++++++++++++++++++++
 instrument/cmdline.h     |   58 +++++++++++++++++++++++
 3 files changed, 176 insertions(+)
 create mode 100644 instrument/cmdline.c
 create mode 100644 instrument/cmdline.h

diff --git a/instrument/Makefile.objs b/instrument/Makefile.objs
index 244936aa8c..aa6db29ff4 100644
--- a/instrument/Makefile.objs
+++ b/instrument/Makefile.objs
@@ -43,3 +43,4 @@ $(obj)/qemu-instr/events.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)
 # Control code
 
 target-obj-y += control.o
+target-obj-y += cmdline.o
diff --git a/instrument/cmdline.c b/instrument/cmdline.c
new file mode 100644
index 0000000000..e0c0e9ce1b
--- /dev/null
+++ b/instrument/cmdline.c
@@ -0,0 +1,117 @@
+/*
+ * Control dynamic trace instrumentation during program (de)initialization.
+ *
+ * Copyright (C) 2012-2017 Lluís Vilanova <vilanova@ac.upc.edu>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include <dlfcn.h>
+#include "instrument/cmdline.h"
+#include "instrument/control.h"
+#include "qemu/config-file.h"
+#include "qemu/error-report.h"
+
+
+QemuOptsList qemu_instr_opts = {
+    .name = "instrument",
+    .implied_opt_name = "file",
+    .merge_lists = true,
+    .head = QTAILQ_HEAD_INITIALIZER(qemu_instr_opts.head),
+    .desc = {
+        {
+            .name = "file",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "arg",
+            .type = QEMU_OPT_STRING,
+        },
+        { /* end of list */ }
+    },
+};
+
+void instr_opt_parse(const char *optarg, char **path,
+                     int *argc, const char ***argv)
+{
+    const char *arg;
+    QemuOptsIter iter;
+    QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("instrument"),
+                                             optarg, true);
+    if (!opts) {
+        exit(1);
+    } else {
+#if !defined(CONFIG_INSTRUMENT)
+        error_report("instrumentation not enabled on this build");
+        exit(1);
+#endif
+    }
+
+
+    arg = qemu_opt_get(opts, "file");
+    if (arg != NULL) {
+        g_free(*path);
+        *path = g_strdup(arg);
+    }
+
+    qemu_opt_iter_init(&iter, opts, "arg");
+    while ((arg = qemu_opt_iter_next(&iter)) != NULL) {
+        *argv = realloc(*argv, sizeof(**argv) * (*argc + 1));
+        (*argv)[*argc] = g_strdup(arg);
+        (*argc)++;
+    }
+
+    qemu_opts_del(opts);
+}
+
+
+void instr_init(const char *path, int argc, const char **argv)
+{
+    InstrLoadError err;
+    int64_t handle;
+
+    if (path == NULL) {
+        return;
+    }
+
+    if (atexit(instr_fini) != 0) {
+        fprintf(stderr, "error: atexit: %s\n", strerror(errno));
+        abort();
+    }
+
+    err = instr_load(path, argc, argv, &handle);
+    switch (err) {
+    case INSTR_LOAD_OK:
+        return;
+    case INSTR_LOAD_UNAVAILABLE:
+        error_report("instrument: not available");
+        break;
+    case INSTR_LOAD_ERROR:
+        error_report("instrument: error loading library: %s", dlerror());
+        break;
+    }
+
+    exit(1);
+}
+
+void instr_fini(void)
+{
+    InstrUnloadError err = instr_unload_all();
+
+    switch (err) {
+    case INSTR_UNLOAD_OK:
+        return;
+    case INSTR_UNLOAD_UNAVAILABLE:
+        error_report("instrument: not available");
+        break;
+    case INSTR_UNLOAD_INVALID:
+        /* the user might have already unloaded it */
+        return;
+    case INSTR_UNLOAD_ERROR:
+        error_report("instrument: error unloading library: %s", dlerror());
+        break;
+    }
+
+    exit(1);
+}
diff --git a/instrument/cmdline.h b/instrument/cmdline.h
new file mode 100644
index 0000000000..c5eebf8b58
--- /dev/null
+++ b/instrument/cmdline.h
@@ -0,0 +1,58 @@
+/*
+ * Control dynamic trace instrumentation during program (de)initialization.
+ *
+ * Copyright (C) 2012-2017 Lluís Vilanova <vilanova@ac.upc.edu>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef INSTRUMENT__CMDLINE_H
+#define INSTRUMENT__CMDLINE_H
+
+
+/**
+ * Definition of QEMU options describing instrumentation subsystem
+ * configuration.
+ */
+extern QemuOptsList qemu_instr_opts;
+
+/**
+ * instr_opt_parse:
+ * @optarg: A string argument of --instrument command line argument
+ *
+ * Initialize instrument subsystem.
+ */
+void instr_opt_parse(const char *optarg, char **path,
+                     int *argc, const char ***argv);
+
+/**
+ * instr_init:
+ * @path: Path to dynamic trace instrumentation library.
+ * @argc: Number of arguments to the library's #qi_init routine.
+ * @argv: Arguments to the library's #qi_init routine.
+ *
+ * Load and initialize the given instrumentation library.
+ *
+ * Automatically installs #instr_fini as an atexit callback.
+ *
+ * If path is %NULL and we're running with static instrumentation, the library
+ * is not loaded but just initialized.
+ *
+ * Pre-condition: There is no library already loaded.
+ */
+void instr_init(const char *path, int argc, const char **argv);
+
+/**
+ * instr_fini:
+ *
+ * Deinitialize and unload the current instrumentation library.
+ *
+ * If we're running with static instrumentation, the library is not unloaded but
+ * just deinitialized.
+ *
+ * Pre-condition: There is an already loaded library.
+ */
+void instr_fini(void);
+
+#endif  /* INSTRUMENT__CMDLINE_H */

  parent reply	other threads:[~2017-07-24 17:30 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-24 17:02 [Qemu-devel] [PATCH 00/13] instrument: Add basic event instrumentation Lluís Vilanova
2017-07-24 17:06 ` [Qemu-devel] [PATCH 01/13] instrument: Add documentation Lluís Vilanova
2017-07-24 17:10 ` [Qemu-devel] [PATCH 02/13] instrument: [none] Add null instrumentation mode Lluís Vilanova
2017-07-24 17:14 ` [Qemu-devel] [PATCH 03/13] instrument: [dynamic] Add dynamic " Lluís Vilanova
2017-07-24 17:18 ` [Qemu-devel] [PATCH 04/13] instrument: Allow adding the "instrument" property without modifying event files Lluís Vilanova
2017-07-24 17:22 ` [Qemu-devel] [PATCH 05/13] instrument: [dynamic] Add default public per-event functions Lluís Vilanova
2017-07-24 17:26 ` [Qemu-devel] [PATCH 06/13] instrument: Add event control interface Lluís Vilanova
2017-07-24 17:30 ` Lluís Vilanova [this message]
2017-07-24 17:34 ` [Qemu-devel] [PATCH 08/13] instrument: [linux-user] Add command line library loader Lluís Vilanova
2017-07-24 17:38 ` [Qemu-devel] [PATCH 09/13] instrument: [bsd-user] " Lluís Vilanova
2017-07-24 17:42 ` [Qemu-devel] [PATCH 10/13] instrument: [softmmu] " Lluís Vilanova
2017-07-24 17:46 ` [Qemu-devel] [PATCH 11/13] instrument: [qapi] Add " Lluís Vilanova
2017-07-24 18:03   ` Eric Blake
2017-07-25  8:24     ` Lluís Vilanova
2017-07-25 11:30       ` Eric Blake
2017-07-25 11:51         ` Lluís Vilanova
2017-07-24 17:50 ` [Qemu-devel] [PATCH 12/13] instrument: [hmp] " Lluís Vilanova
2017-07-24 17:54 ` [Qemu-devel] [PATCH 13/13] trace: Rename C++-specific names in event arguments Lluís Vilanova
2017-07-25 13:19 ` [Qemu-devel] [PATCH 00/13] instrument: Add basic event instrumentation Stefan Hajnoczi
2017-07-25 13:30   ` Peter Maydell
2017-07-25 15:11     ` Lluís Vilanova
2017-07-26 11:22       ` Stefan Hajnoczi
2017-07-26 12:44         ` Lluís Vilanova
2017-07-27 10:32           ` Stefan Hajnoczi
2017-07-27 10:40             ` Peter Maydell
2017-07-28 13:42               ` Stefan Hajnoczi
2017-07-28 16:21                 ` Lluís Vilanova
2017-08-02 11:04                   ` Stefan Hajnoczi
2017-07-26 11:26     ` Stefan Hajnoczi
2017-07-26 11:49       ` Peter Maydell
2017-07-26 12:26         ` Lluís Vilanova
2017-07-27 10:43         ` Daniel P. Berrange
2017-07-27 10:54           ` Peter Maydell
2017-07-27 14:58             ` Lluís Vilanova
2017-07-27 15:21             ` Daniel P. Berrange
2017-07-27 15:33               ` Peter Maydell
2017-07-27 15:45                 ` Daniel P. Berrange
2017-07-28 13:34                   ` Stefan Hajnoczi
2017-07-28 13:41                     ` Peter Maydell
2017-07-28 14:06                       ` Daniel P. Berrange
2017-07-28 16:05                         ` Lluís Vilanova
2017-08-01 13:48                           ` Stefan Hajnoczi
2017-08-01 13:54                             ` Peter Maydell
2017-08-02 11:04                               ` Stefan Hajnoczi
2017-08-02 11:10                                 ` Peter Maydell
2017-08-02 14:49                                   ` Stefan Hajnoczi
2017-08-02 15:19                                     ` Lluís Vilanova
2017-08-03 11:54                                       ` Stefan Hajnoczi
2017-08-26  0:14                                         ` Emilio G. Cota
2017-08-26  0:02                           ` Emilio G. Cota
2017-08-29  9:19                             ` Peter Maydell
2017-07-28 13:52                     ` Daniel P. Berrange
2017-07-28 16:14                       ` Lluís Vilanova
2017-08-01 13:13                         ` Stefan Hajnoczi
2017-07-28 15:10                     ` Lluís Vilanova
2017-07-27 19:55               ` Lluís Vilanova
2017-07-25 14:47   ` Lluís Vilanova
2017-07-26 11:29     ` Stefan Hajnoczi
2017-07-26 12:31       ` Lluís Vilanova

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=150091744146.30739.9284399356256394869.stgit@frigg.lan \
    --to=vilanova@ac.upc.edu \
    --cc=cota@braap.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.