From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7711 invoked by alias); 15 Apr 2013 15:12:09 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 7649 invoked by uid 89); 15 Apr 2013 15:12:08 -0000 X-Spam-SWARE-Status: No, score=-4.7 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,KHOP_RCVD_TRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE autolearn=ham version=3.3.1 Received: from mail-ob0-f175.google.com (HELO mail-ob0-f175.google.com) (209.85.214.175) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 15 Apr 2013 15:12:07 +0000 Received: by mail-ob0-f175.google.com with SMTP id va7so4158463obc.6 for ; Mon, 15 Apr 2013 08:12:05 -0700 (PDT) X-Received: by 10.60.16.69 with SMTP id e5mr7725437oed.68.1366038725788; Mon, 15 Apr 2013 08:12:05 -0700 (PDT) MIME-Version: 1.0 Received: by 10.60.13.133 with HTTP; Mon, 15 Apr 2013 08:11:25 -0700 (PDT) In-Reply-To: References: <51665508.5050706@mentor.com> <5166558B.90201@mentor.com> <5166B259.10704@codesourcery.com> From: Hui Zhu Date: Mon, 15 Apr 2013 19:01:00 -0000 Message-ID: Subject: Re: [PATCH] store trace default-collect to target [3/6] tfile To: gdb-patches ml Cc: Hui Zhu , Yao Qi Content-Type: multipart/mixed; boundary=089e0149c674000c9c04da67ad92 X-Virus-Found: No X-SW-Source: 2013-04/txt/msg00430.txt.bz2 --089e0149c674000c9c04da67ad92 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-length: 5623 Post a new version to fix the typo of "collest". Thanks, Hui 2013-04-15 Hui Zhu * ctf.c (ctf_write_default_collect): New. (trace_file_write_ops): Add ctf_write_default_collect. * tracepoint.c (tfile_write_default_collect): New. (trace_file_write_ops): Add tfile_write_default_collect. (trace_save): Call writer->ops->write_default_collect. (tfile_interp_line): Add collectp. (tfile_open): Add support of default collect. * tracepoint.h (trace_file_write_ops): Add write_default_collect. On Fri, Apr 12, 2013 at 6:45 PM, Hui Zhu wrote: > Hi Yao, > > Thanks for your patch. > > I should do it but I didn't because when I work on this part I cannot > find example in GDB src bceause the code that can be example is still > not check in. :P > > Best, > Hui > > On Thu, Apr 11, 2013 at 8:53 PM, Yao Qi wrote: >> On 04/11/2013 02:17 PM, Hui Zhu wrote: >>> /* This is the implementation of trace_file_write_ops method >>> + write_default_collect. */ >>> + >>> +static void >>> +ctf_write_default_collect (struct trace_file_writer *self, >>> + char *collect) >>> +{ >>> + /* It is not supported yet to write default collect >>> + into CTF trace data. */ >>> +} >>> + >> >> It is pity to see "default-collect" is not written to CTF in this >> patch. The patch below is about teaching GDB to write >> "default-collect" action in CTF and read "default-collect" action from >> CTF. Do you mind incorporating the patch below into your patch series, >> so that your series is more complete. >> >> -- >> Yao (=E9=BD=90=E5=B0=A7) >> >> gdb: >> >> 2013-04-11 Yao Qi >> >> * ctf.c (CTF_EVENT_ID_DEFAULT_COLLECT): New macro. >> (ctf_write_header): Write metadata for "default-collect" >> action. >> (ctf_write_default_collect): Write "default-collect" action >> in CTF. >> (ctf_read_default_collect): New. >> (ctf_open): Call ctf_read_default_collect. >> --- >> gdb/ctf.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++-- >> 1 files changed, 57 insertions(+), 2 deletions(-) >> >> diff --git a/gdb/ctf.c b/gdb/ctf.c >> index 2dd2ed8..5757b47 100644 >> --- a/gdb/ctf.c >> +++ b/gdb/ctf.c >> @@ -74,6 +74,7 @@ >> #define CTF_EVENT_ID_STATUS 4 >> #define CTF_EVENT_ID_TSV_DEF 5 >> #define CTF_EVENT_ID_TP_DEF 6 >> +#define CTF_EVENT_ID_DEFAULT_COLLECT 7 >> >> /* The state kept while writing the CTF datastream file. */ >> >> @@ -428,6 +429,16 @@ ctf_write_header (struct trace_file_writer *self) >> "\t};\n" >> "};\n", CTF_EVENT_ID_TP_DEF); >> >> + ctf_save_write_metadata (&writer->tcs, "\n"); >> + ctf_save_write_metadata (&writer->tcs, >> + "event {\n\tname =3D \"default_collect\";\n" >> + "\tid =3D %u;\n" >> + "\tfields :=3D struct { \n" >> + "\t\tchars contents;\n" >> + "\t};\n" >> + "};\n", >> + CTF_EVENT_ID_DEFAULT_COLLECT); >> + >> gdb_assert (writer->tcs.content_size =3D=3D 0); >> gdb_assert (writer->tcs.packet_start =3D=3D 0); >> >> @@ -622,8 +633,17 @@ static void >> ctf_write_default_collect (struct trace_file_writer *self, >> char *collect) >> { >> - /* It is not supported yet to write default collect >> - into CTF trace data. */ >> + struct ctf_trace_file_writer *writer >> + =3D (struct ctf_trace_file_writer *) self; >> + int32_t int32; >> + >> + /* Event Id. */ >> + int32 =3D CTF_EVENT_ID_DEFAULT_COLLECT; >> + ctf_save_align_write (&writer->tcs, (gdb_byte *) &int32, 4, 4); >> + >> + /* Contents. */ >> + ctf_save_write (&writer->tcs, collect, strlen (collect) + 1); >> + >> } >> >> /* This is the implementation of trace_file_write_ops method >> @@ -1149,6 +1169,39 @@ ctf_read_tp (struct uploaded_tp **uploaded_tps) >> } >> } >> >> +/* Read a CTF event on "default-collect" and update the >> + "default-collect" action. */ >> + >> +static void >> +ctf_read_default_collect (void) >> +{ >> + struct bt_ctf_event *event; >> + const struct bt_definition *scope; >> + uint32_t u32; >> + char *default_collect; >> + >> + event =3D bt_ctf_iter_read_event (ctf_iter); >> + scope =3D bt_ctf_get_top_level_scope (event, >> + BT_STREAM_EVENT_HEADER); >> + u32 =3D bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, >> + "id")); >> + >> + if (u32 !=3D CTF_EVENT_ID_DEFAULT_COLLECT) >> + error (_("Wrong event id!")); >> + >> + default_collect >> + =3D bt_ctf_get_string (bt_ctf_get_field (event, scope, "contents")); >> + >> + if (default_collect =3D=3D NULL) >> + default_collect =3D xstrdup (""); >> + else >> + default_collect =3D xstrdup (default_collect); >> + >> + trace_set_default_collect (default_collect); >> + >> + bt_iter_next (bt_ctf_get_iter (ctf_iter)); >> +} >> + >> /* This is the implementation of target_ops method to_open. Open CTF >> trace data, read trace status, trace state variables and tracepoint >> definitions from the first packet. Set the start position at the >> @@ -1190,6 +1243,8 @@ ctf_open (char *dirname, int from_tty) >> >> ctf_read_tp (&uploaded_tps); >> >> + ctf_read_default_collect (); >> + >> event =3D bt_ctf_iter_read_event (ctf_iter); >> /* EVENT can be NULL if we've already gone to the end of stream of >> events. */ >> -- >> 1.7.7.6 --089e0149c674000c9c04da67ad92 Content-Type: text/plain; charset=US-ASCII; name="defc-tfile.txt" Content-Disposition: attachment; filename="defc-tfile.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hfjs5evi0 Content-length: 5539 LS0tIGEvY3RmLmMKKysrIGIvY3RmLmMKQEAgLTYxNiw2ICs2MTYsMTcgQEAg Y3RmX3dyaXRlX3VwbG9hZGVkX3RwIChzdHJ1Y3QgdHJhY2VfZmlsZQogfQog CiAvKiBUaGlzIGlzIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiB0cmFjZV9maWxl X3dyaXRlX29wcyBtZXRob2QKKyAgIHdyaXRlX2RlZmF1bHRfY29sbGVjdC4g ICovCisKK3N0YXRpYyB2b2lkCitjdGZfd3JpdGVfZGVmYXVsdF9jb2xsZWN0 IChzdHJ1Y3QgdHJhY2VfZmlsZV93cml0ZXIgKnNlbGYsCisJCQkgICBjaGFy ICpjb2xsZWN0KQoreworICAvKiBJdCBpcyBub3Qgc3VwcG9ydGVkIHlldCB0 byB3cml0ZSBkZWZhdWx0IGNvbGxlY3QKKyAgICAgaW50byBDVEYgdHJhY2Ug ZGF0YS4gICovCit9CisKKy8qIFRoaXMgaXMgdGhlIGltcGxlbWVudGF0aW9u IG9mIHRyYWNlX2ZpbGVfd3JpdGVfb3BzIG1ldGhvZAogICAgd3JpdGVfZGVm aW5pdGlvbl9lbmQuICAqLwogCiBzdGF0aWMgdm9pZApAQCAtODQ3LDYgKzg1 OCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgdHJhY2VfZmlsZV93cml0ZV9v cHMKICAgY3RmX3dyaXRlX3N0YXR1cywKICAgY3RmX3dyaXRlX3VwbG9hZGVk X3RzdiwKICAgY3RmX3dyaXRlX3VwbG9hZGVkX3RwLAorICBjdGZfd3JpdGVf ZGVmYXVsdF9jb2xsZWN0LAogICBjdGZfd3JpdGVfZGVmaW5pdGlvbl9lbmQs CiAgIE5VTEwsCiAgICZjdGZfd3JpdGVfZnJhbWVfb3BzLAotLS0gYS90cmFj ZXBvaW50LmMKKysrIGIvdHJhY2Vwb2ludC5jCkBAIC0zMjM3LDYgKzMyMzcs MTkgQEAgdGZpbGVfd3JpdGVfdXBsb2FkZWRfdHAgKHN0cnVjdCB0cmFjZV9m aQogfQogCiAvKiBUaGlzIGlzIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiB0cmFj ZV9maWxlX3dyaXRlX29wcyBtZXRob2QKKyAgIHdyaXRlX2RlZmF1bHRfY29s bGVjdC4gICovCisKK3N0YXRpYyB2b2lkCit0ZmlsZV93cml0ZV9kZWZhdWx0 X2NvbGxlY3QgKHN0cnVjdCB0cmFjZV9maWxlX3dyaXRlciAqc2VsZiwKKwkJ CSAgICAgY2hhciAqY29sbGVjdCkKK3sKKyAgc3RydWN0IHRmaWxlX3RyYWNl X2ZpbGVfd3JpdGVyICp3cml0ZXIKKyAgICA9IChzdHJ1Y3QgdGZpbGVfdHJh Y2VfZmlsZV93cml0ZXIgKikgc2VsZjsKKworICBmcHJpbnRmICh3cml0ZXIt PmZwLCAiZGMgJXNcbiIsIGNvbGxlY3QpOworfQorCisvKiBUaGlzIGlzIHRo ZSBpbXBsZW1lbnRhdGlvbiBvZiB0cmFjZV9maWxlX3dyaXRlX29wcyBtZXRo b2QKICAgIHdyaXRlX2RlZmluaXRpb25fZW5kLiAgKi8KIAogc3RhdGljIHZv aWQKQEAgLTMyODksNiArMzMwMiw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg dHJhY2VfZmlsZV93cml0ZV9vcHMKICAgdGZpbGVfd3JpdGVfc3RhdHVzLAog ICB0ZmlsZV93cml0ZV91cGxvYWRlZF90c3YsCiAgIHRmaWxlX3dyaXRlX3Vw bG9hZGVkX3RwLAorICB0ZmlsZV93cml0ZV9kZWZhdWx0X2NvbGxlY3QsCiAg IHRmaWxlX3dyaXRlX2RlZmluaXRpb25fZW5kLAogICB0ZmlsZV93cml0ZV9y YXdfZGF0YSwKICAgTlVMTCwKQEAgLTMzNzgsNiArMzM5Miw4IEBAIHRyYWNl X3NhdmUgKGNvbnN0IGNoYXIgKmZpbGVuYW1lLCBzdHJ1Y3QKICAgZm9yICh1 dHAgPSB1cGxvYWRlZF90cHM7IHV0cDsgdXRwID0gdXRwLT5uZXh0KQogICAg IHdyaXRlci0+b3BzLT53cml0ZV91cGxvYWRlZF90cCAod3JpdGVyLCB1dHAp OwogCisgIHdyaXRlci0+b3BzLT53cml0ZV9kZWZhdWx0X2NvbGxlY3QgKHdy aXRlciwgZGVmYXVsdF9jb2xsZWN0KTsKKwogICBmcmVlX3VwbG9hZGVkX3Rw cyAoJnVwbG9hZGVkX3Rwcyk7CiAKICAgLyogTWFyayB0aGUgZW5kIG9mIHRo ZSBkZWZpbml0aW9uIHNlY3Rpb24uICAqLwpAQCAtNDE0Nyw3ICs0MTYzLDgg QEAgaW50IHRyYWNlX3JlZ2Jsb2NrX3NpemU7CiAKIHN0YXRpYyB2b2lkIHRm aWxlX2ludGVycF9saW5lIChjaGFyICpsaW5lLAogCQkJICAgICAgIHN0cnVj dCB1cGxvYWRlZF90cCAqKnV0cHAsCi0JCQkgICAgICAgc3RydWN0IHVwbG9h ZGVkX3RzdiAqKnV0c3ZwKTsKKwkJCSAgICAgICBzdHJ1Y3QgdXBsb2FkZWRf dHN2ICoqdXRzdnAsCisJCQkgICAgICAgY2hhciAqKmNvbGxlY3RwKTsKIAog LyogUmVhZCBTSVpFIGJ5dGVzIGludG8gUkVBREJVRiBmcm9tIHRoZSB0cmFj ZSBmcmFtZSwgc3RhcnRpbmcgYXQKICAgIFRSQUNFX0ZEJ3MgY3VycmVudCBw b3NpdGlvbi4gIE5vdGUgdGhhdCB0aGlzIGNhbGwgYHJlYWQnCkBAIC00MTgy LDYgKzQxOTksNyBAQCB0ZmlsZV9vcGVuIChjaGFyICpmaWxlbmFtZSwgaW50 IGZyb21fdHR5CiAgIHN0cnVjdCB0cmFjZV9zdGF0dXMgKnRzOwogICBzdHJ1 Y3QgdXBsb2FkZWRfdHAgKnVwbG9hZGVkX3RwcyA9IE5VTEw7CiAgIHN0cnVj dCB1cGxvYWRlZF90c3YgKnVwbG9hZGVkX3RzdnMgPSBOVUxMOworICBjaGFy ICp1cGxvYWRlZF9kZWZhdWx0X2NvbGxlY3QgPSBOVUxMOwogCiAgIHRhcmdl dF9wcmVvcGVuIChmcm9tX3R0eSk7CiAgIGlmICghZmlsZW5hbWUpCkBAIC00 MjUxLDcgKzQyNjksOCBAQCB0ZmlsZV9vcGVuIChjaGFyICpmaWxlbmFtZSwg aW50IGZyb21fdHR5CiAJCWJyZWFrOwogCSAgICAgIGxpbmVidWZbaV0gPSAn XDAnOwogCSAgICAgIGkgPSAwOwotCSAgICAgIHRmaWxlX2ludGVycF9saW5l IChsaW5lYnVmLCAmdXBsb2FkZWRfdHBzLCAmdXBsb2FkZWRfdHN2cyk7CisJ ICAgICAgdGZpbGVfaW50ZXJwX2xpbmUgKGxpbmVidWYsICZ1cGxvYWRlZF90 cHMsICZ1cGxvYWRlZF90c3ZzLAorCQkJCSAmdXBsb2FkZWRfZGVmYXVsdF9j b2xsZWN0KTsKIAkgICAgfQogCSAgZWxzZQogCSAgICBsaW5lYnVmW2krK10g PSBieXRlOwpAQCAtNDI4OSw2ICs0MzA4LDggQEAgdGZpbGVfb3BlbiAoY2hh ciAqZmlsZW5hbWUsIGludCBmcm9tX3R0eQogCiAgIG1lcmdlX3VwbG9hZGVk X3RyYWNlcG9pbnRzICgmdXBsb2FkZWRfdHBzKTsKIAorICB0cmFjZV9zZXRf ZGVmYXVsdF9jb2xsZWN0ICh1cGxvYWRlZF9kZWZhdWx0X2NvbGxlY3QpOwor CiAgIHBvc3RfY3JlYXRlX2luZmVyaW9yICgmdGZpbGVfb3BzLCBmcm9tX3R0 eSk7CiB9CiAKQEAgLTQyOTcsNyArNDMxOCw4IEBAIHRmaWxlX29wZW4gKGNo YXIgKmZpbGVuYW1lLCBpbnQgZnJvbV90dHkKIAogc3RhdGljIHZvaWQKIHRm aWxlX2ludGVycF9saW5lIChjaGFyICpsaW5lLAotCQkgICBzdHJ1Y3QgdXBs b2FkZWRfdHAgKip1dHBwLCBzdHJ1Y3QgdXBsb2FkZWRfdHN2ICoqdXRzdnAp CisJCSAgIHN0cnVjdCB1cGxvYWRlZF90cCAqKnV0cHAsIHN0cnVjdCB1cGxv YWRlZF90c3YgKip1dHN2cCwKKwkJICAgY2hhciAqKmNvbGxlY3RwKQogewog ICBjaGFyICpwID0gbGluZTsKIApAQCAtNDMyMSw2ICs0MzQzLDExIEBAIHRm aWxlX2ludGVycF9saW5lIChjaGFyICpsaW5lLAogICAgICAgcCArPSBzdHJs ZW4gKCJ0c3YgIik7CiAgICAgICBwYXJzZV90c3ZfZGVmaW5pdGlvbiAocCwg dXRzdnApOwogICAgIH0KKyAgZWxzZSBpZiAoc3RybmNtcCAocCwgImRjICIs IHN0cmxlbiAoImRjICIpKSA9PSAwKQorICAgIHsKKyAgICAgIHAgKz0gc3Ry bGVuICgiZGMgIik7CisgICAgICAqY29sbGVjdHAgPSB4c3RyZHVwIChwKTsK KyAgICB9CiAgIGVsc2UKICAgICB3YXJuaW5nIChfKCJJZ25vcmluZyB0cmFj ZSBmaWxlIGRlZmluaXRpb24gXCIlc1wiIiksIGxpbmUpOwogfQotLS0gYS90 cmFjZXBvaW50LmgKKysrIGIvdHJhY2Vwb2ludC5oCkBAIC0yOTYsNiArMjk2 LDEwIEBAIHN0cnVjdCB0cmFjZV9maWxlX3dyaXRlX29wcwogICB2b2lkICgq d3JpdGVfdXBsb2FkZWRfdHApIChzdHJ1Y3QgdHJhY2VfZmlsZV93cml0ZXIg KnNlbGYsCiAJCQkgICAgIHN0cnVjdCB1cGxvYWRlZF90cCAqdHApOwogCisg IC8qIFdyaXRlIHRoZSB0cmFjZXBvaW50IGRlZmF1bHQgY29sbGVjdC4gICov CisgIHZvaWQgKCp3cml0ZV9kZWZhdWx0X2NvbGxlY3QpIChzdHJ1Y3QgdHJh Y2VfZmlsZV93cml0ZXIgKnNlbGYsCisJCQkJIGNoYXIgKmNvbGxlY3QpOwor CiAgIC8qIFdyaXRlIHRvIG1hcmsgdGhlIGVuZCBvZiB0aGUgZGVmaW5pdGlv biBwYXJ0LiAgKi8KICAgdm9pZCAoKndyaXRlX2RlZmluaXRpb25fZW5kKSAo c3RydWN0IHRyYWNlX2ZpbGVfd3JpdGVyICpzZWxmKTsKIAo= --089e0149c674000c9c04da67ad92--