lkml.org 
[lkml]   [2008]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] spufs support multiple probes markers
    * Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca) wrote:
    > * Andrew Morton (akpm@linux-foundation.org) wrote:
    > >
    > > fyi, I have this on hold because I spotted spufs build breakage,
    > > but I haven't had time to investigate. powerpc allmodconfig, iirc.
    >
    > Christoph told me he would update his sputrace accordingly. Christoph,
    > should I do the changes or let you do it ?
    >
    > It's mostly the probe function prototype which changes from
    >
    > -typedef void marker_probe_func(const struct marker *mdata,
    > - void *private_data, const char *fmt, ...);
    >
    > to
    >
    > +typedef void marker_probe_func(void *probe_private, void *call_private,
    > + const char *fmt, va_list *args);
    >
    > Where you receive an already ready va_list instead of having to call
    > va_start/va_end in the probe.
    >
    > Also, there is no more marker_arm/marker_disarm. It is now automatically
    > done upon register/unregister.
    >
    > Mathieu
    >

    Update spufs to the new linux kernel markers API, which supports connecting
    more than one probe to a single marker.

    (compile-tested only)

    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
    CC: Christoph Hellwig <hch@infradead.org>
    CC: "Frank Ch. Eigler" <fche@redhat.com>
    CC: Steven Rostedt <rostedt@goodmis.org>
    CC: Andrew Morton <akpm@linux-foundation.org>
    ---
    arch/powerpc/platforms/cell/spufs/sputrace.c | 31 +++++++++------------------
    1 file changed, 11 insertions(+), 20 deletions(-)

    Index: linux-2.6-lttng/arch/powerpc/platforms/cell/spufs/sputrace.c
    ===================================================================
    --- linux-2.6-lttng.orig/arch/powerpc/platforms/cell/spufs/sputrace.c 2008-02-12 15:07:25.000000000 -0500
    +++ linux-2.6-lttng/arch/powerpc/platforms/cell/spufs/sputrace.c 2008-02-12 15:11:39.000000000 -0500
    @@ -146,34 +146,28 @@
    wake_up(&sputrace_wait);
    }

    -static void spu_context_event(const struct marker *mdata,
    - void *private, const char *format, ...)
    +static void spu_context_event(void *probe_private, void *call_data,
    + const char *format, va_list *args)
    {
    - struct spu_probe *p = mdata->private;
    - va_list ap;
    + struct spu_probe *p = probe_private;
    struct spu_context *ctx;
    struct spu *spu;

    - va_start(ap, format);
    - ctx = va_arg(ap, struct spu_context *);
    - spu = va_arg(ap, struct spu *);
    + ctx = va_arg(*args, struct spu_context *);
    + spu = va_arg(*args, struct spu *);

    sputrace_log_item(p->name, ctx, spu);
    - va_end(ap);
    }

    -static void spu_context_nospu_event(const struct marker *mdata,
    - void *private, const char *format, ...)
    +static void spu_context_nospu_event(void *probe_private, void *call_data,
    + const char *format, va_list *args)
    {
    - struct spu_probe *p = mdata->private;
    - va_list ap;
    + struct spu_probe *p = probe_private;
    struct spu_context *ctx;

    - va_start(ap, format);
    - ctx = va_arg(ap, struct spu_context *);
    + ctx = va_arg(*args, struct spu_context *);

    sputrace_log_item(p->name, ctx, NULL);
    - va_end(ap);
    }

    struct spu_probe spu_probes[] = {
    @@ -219,10 +213,6 @@
    if (error)
    printk(KERN_INFO "Unable to register probe %s\n",
    p->name);
    -
    - error = marker_arm(p->name);
    - if (error)
    - printk(KERN_INFO "Unable to arm probe %s\n", p->name);
    }

    return 0;
    @@ -238,7 +228,8 @@
    int i;

    for (i = 0; i < ARRAY_SIZE(spu_probes); i++)
    - marker_probe_unregister(spu_probes[i].name);
    + marker_probe_unregister(spu_probes[i].name,
    + spu_probes[i].probe_func, &spu_probes[i]);

    remove_proc_entry("sputrace", NULL);
    kfree(sputrace_log);

    --
    Mathieu Desnoyers
    Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
    OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68


    \
     
     \ /
      Last update: 2008-02-13 00:59    [W:0.026 / U:0.684 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site