Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Josef Bacik <jbacik@fb.com>
To:     Steven Rostedt <rostedt@goodmis.org>
CC:     Kernel Team <Kernel-team@fb.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Linux Trace Devel <linux-trace-devel@vger.kernel.org>
Subject: Re: [PATCH 04/11] trace-cmd: add global functions for live tracing
Thread-Topic: [PATCH 04/11] trace-cmd: add global functions for live tracing
Thread-Index: AQHVNleOuLpgwbsJSEOYB0Yq9lXov6bCT5/q
Date:   Tue, 9 Jul 2019 13:56:49 +0000
Message-ID: <0C57E3DE-5CA6-4958-B1B7-A19E5F95C7C6@fb.com>
References: <1448053053-24188-1-git-send-email-jbacik@fb.com>
        <1448053053-24188-5-git-send-email-jbacik@fb.com>,<20190709090917.7705c1da@gandalf.local.home>
In-Reply-To: <20190709090917.7705c1da@gandalf.local.home>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: fb.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 8dca52c5-39a2-4d1a-63c6-08d7047549f1
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jul 2019 13:56:49.1726
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: jbacik@fb.com
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR15MB1250
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-07-09_05:,,
 signatures=0
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501
 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0
 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0
 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.0.1-1810050000 definitions=main-1907090166
X-FB-Internal: deliver
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Yup go for it, thanks,

Josef

Sent from my iPhone

> On Jul 9, 2019, at 9:09 AM, Steven Rostedt <rostedt@goodmis.org> wrote:
>=20
> On Fri, 20 Nov 2015 15:57:26 -0500
> Josef Bacik <jbacik@fb.com> wrote:
>=20
>> We need a few functions to disable/enable tracing as well as add events =
to be
>> enabled on the first instance, this patch turns a couple of these local
>> functions into library functions.  Thanks,
>=20
> Hi Josef,
>=20
> Not sure you still use this, as it's not really a library function
> anymore. But we are currently cleaning up the trace-cmd code to create
> a real library, and doing it in baby steps. The
> tracecmd_enable_events() function is causing some issues and it was
> added by you. Are you OK if we remove it. At least temporarily until we
> separate out the "enabling" part into the library?
>=20
> Thanks!
>=20
> -- Steve
>=20
>=20
>>=20
>> Signed-off-by: Josef Bacik <jbacik@fb.com>
>> ---
>> trace-cmd.h    |  5 +++++
>> trace-record.c | 45 +++++++++++++++++++++++++++------------------
>> 2 files changed, 32 insertions(+), 18 deletions(-)
>>=20
>> diff --git a/trace-cmd.h b/trace-cmd.h
>> index b4fa7fd..9a9ca30 100644
>> --- a/trace-cmd.h
>> +++ b/trace-cmd.h
>> @@ -268,6 +268,11 @@ int tracecmd_start_recording(struct tracecmd_record=
er *recorder, unsigned long s
>> void tracecmd_stop_recording(struct tracecmd_recorder *recorder);
>> void tracecmd_stat_cpu(struct trace_seq *s, int cpu);
>> long tracecmd_flush_recording(struct tracecmd_recorder *recorder);
>> +int tracecmd_add_event(const char *event_str, int stack);
>> +void tracecmd_enable_events(void);
>> +void tracecmd_disable_all_tracing(int disable_tracer);
>> +void tracecmd_disable_tracing(void);
>> +void tracecmd_enable_tracing(void);
>>=20
>> /* --- Plugin handling --- */
>> extern struct pevent_plugin_option trace_ftrace_options[];
>> diff --git a/trace-record.c b/trace-record.c
>> index 417b701..7c471ab 100644
>> --- a/trace-record.c
>> +++ b/trace-record.c
>> @@ -841,7 +841,6 @@ static void update_ftrace_pids(int reset)
>>=20
>> static void update_event_filters(struct buffer_instance *instance);
>> static void update_pid_event_filters(struct buffer_instance *instance);
>> -static void enable_tracing(void);
>>=20
>> /**
>>  * make_pid_filter - create a filter string to all pids against @field
>> @@ -1106,7 +1105,7 @@ static void run_cmd(enum trace_type type, int argc=
, char **argv)
>>    if (!pid) {
>>        /* child */
>>        update_task_filter();
>> -        enable_tracing();
>> +        tracecmd_enable_tracing();
>>        enable_ptrace();
>>        /*
>>         * If we are using stderr for stdout, switch
>> @@ -1795,7 +1794,7 @@ static int read_tracing_on(struct buffer_instance =
*instance)
>>    return ret;
>> }
>>=20
>> -static void enable_tracing(void)
>> +void tracecmd_enable_tracing(void)
>> {
>>    struct buffer_instance *instance;
>>=20
>> @@ -1808,7 +1807,7 @@ static void enable_tracing(void)
>>        reset_max_latency();
>> }
>>=20
>> -static void disable_tracing(void)
>> +void tracecmd_disable_tracing(void)
>> {
>>    struct buffer_instance *instance;
>>=20
>> @@ -1816,9 +1815,9 @@ static void disable_tracing(void)
>>        write_tracing_on(instance, 0);
>> }
>>=20
>> -static void disable_all(int disable_tracer)
>> +void tracecmd_disable_all_tracing(int disable_tracer)
>> {
>> -    disable_tracing();
>> +    tracecmd_disable_tracing();
>>=20
>>    if (disable_tracer) {
>>        disable_func_stack_trace();
>> @@ -1991,6 +1990,11 @@ static void enable_events(struct buffer_instance =
*instance)
>>    }
>> }
>>=20
>> +void tracecmd_enable_events(void)
>> +{
>> +    enable_events(first_instance);
>> +}
>> +
>> static void set_clock(struct buffer_instance *instance)
>> {
>>    char *path;
>> @@ -3074,15 +3078,15 @@ static char *get_date_to_ts(void)
>>    }
>>=20
>>    for (i =3D 0; i < date2ts_tries; i++) {
>> -        disable_tracing();
>> +        tracecmd_disable_tracing();
>>        clear_trace();
>> -        enable_tracing();
>> +        tracecmd_enable_tracing();
>>=20
>>        gettimeofday(&start, NULL);
>>        write(tfd, STAMP, 5);
>>        gettimeofday(&end, NULL);
>>=20
>> -        disable_tracing();
>> +        tracecmd_disable_tracing();
>>        ts =3D find_time_stamp(pevent);
>>        if (!ts)
>>            continue;
>> @@ -3699,6 +3703,11 @@ profile_add_event(struct buffer_instance *instanc=
e, const char *event_str, int s
>>    return 0;
>> }
>>=20
>> +int tracecmd_add_event(const char *event_str, int stack)
>> +{
>> +    return profile_add_event(first_instance, event_str, stack);
>> +}
>> +
>> static void enable_profile(struct buffer_instance *instance)
>> {
>>    int stacktrace =3D 0;
>> @@ -3891,7 +3900,7 @@ void trace_record (int argc, char **argv)
>>=20
>>        }
>>        update_first_instance(instance, topt);
>> -        disable_tracing();
>> +        tracecmd_disable_tracing();
>>        exit(0);
>>    } else if (strcmp(argv[1], "restart") =3D=3D 0) {
>>        for (;;) {
>> @@ -3922,7 +3931,7 @@ void trace_record (int argc, char **argv)
>>=20
>>        }
>>        update_first_instance(instance, topt);
>> -        enable_tracing();
>> +        tracecmd_enable_tracing();
>>        exit(0);
>>    } else if (strcmp(argv[1], "reset") =3D=3D 0) {
>>        /* if last arg is -a, then -b and -d apply to all instances */
>> @@ -3984,7 +3993,7 @@ void trace_record (int argc, char **argv)
>>            }
>>        }
>>        update_first_instance(instance, topt);
>> -        disable_all(1);
>> +        tracecmd_disable_all_tracing(1);
>>        set_buffer_size();
>>        clear_filters();
>>        clear_triggers();
>> @@ -4314,7 +4323,7 @@ void trace_record (int argc, char **argv)
>>=20
>>    if (!extract) {
>>        fset =3D set_ftrace(!disable, total_disable);
>> -        disable_all(1);
>> +        tracecmd_disable_all_tracing(1);
>>=20
>>        for_all_instances(instance)
>>            set_clock(instance);
>> @@ -4365,7 +4374,7 @@ void trace_record (int argc, char **argv)
>>    } else {
>>        if (!(type & (TRACE_TYPE_RECORD | TRACE_TYPE_STREAM))) {
>>            update_task_filter();
>> -            enable_tracing();
>> +            tracecmd_enable_tracing();
>>            exit(0);
>>        }
>>=20
>> @@ -4373,7 +4382,7 @@ void trace_record (int argc, char **argv)
>>            run_cmd(type, (argc - optind) - 1, &argv[optind + 1]);
>>        else {
>>            update_task_filter();
>> -            enable_tracing();
>> +            tracecmd_enable_tracing();
>>            /* We don't ptrace ourself */
>>            if (do_ptrace && filter_pid >=3D 0)
>>                ptrace_attach(filter_pid);
>> @@ -4383,7 +4392,7 @@ void trace_record (int argc, char **argv)
>>                trace_or_sleep(type);
>>        }
>>=20
>> -        disable_tracing();
>> +        tracecmd_disable_tracing();
>>        if (!latency)
>>            stop_threads(type);
>>    }
>> @@ -4391,7 +4400,7 @@ void trace_record (int argc, char **argv)
>>    record_stats();
>>=20
>>    if (!keep)
>> -        disable_all(0);
>> +        tracecmd_disable_all_tracing(0);
>>=20
>>    /* extract records the date after extraction */
>>    if (extract && date) {
>> @@ -4399,7 +4408,7 @@ void trace_record (int argc, char **argv)
>>         * We need to start tracing, don't let other traces
>>         * screw with our trace_marker.
>>         */
>> -        disable_all(1);
>> +        tracecmd_disable_all_tracing(1);
>>        date2ts =3D get_date_to_ts();
>>    }
>>=20
>=20