From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11593 invoked by alias); 16 Apr 2013 09:31:22 -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 11584 invoked by uid 89); 16 Apr 2013 09:31:21 -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-f171.google.com (HELO mail-ob0-f171.google.com) (209.85.214.171) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 16 Apr 2013 09:31:20 +0000 Received: by mail-ob0-f171.google.com with SMTP id er7so250255obc.30 for ; Tue, 16 Apr 2013 02:31:19 -0700 (PDT) X-Received: by 10.182.128.105 with SMTP id nn9mr534274obb.10.1366104679067; Tue, 16 Apr 2013 02:31:19 -0700 (PDT) MIME-Version: 1.0 Received: by 10.60.13.133 with HTTP; Tue, 16 Apr 2013 02:30:38 -0700 (PDT) In-Reply-To: References: <51665508.5050706@mentor.com> <5166558B.90201@mentor.com> <5166B259.10704@codesourcery.com> From: Hui Zhu Date: Tue, 16 Apr 2013 15:34: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=e89a8ff1cf6c1f394b04da770817 X-Virus-Found: No X-SW-Source: 2013-04/txt/msg00466.txt.bz2 --e89a8ff1cf6c1f394b04da770817 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-length: 6417 The old patch cannot patch to the upstream, so post a new version for that. Thanks, Hui 2013-04-16 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 Mon, Apr 15, 2013 at 11:11 PM, Hui Zhu wrote: > 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 --e89a8ff1cf6c1f394b04da770817 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_hfkvf6xi0 Content-length: 5507 LS0tIGEvY3RmLmMKKysrIGIvY3RmLmMKQEAgLTYxNyw2ICs2MTcsMTcgQEAg Y3RmX3dyaXRlX3VwbG9hZGVkX3RwIChzdHJ1Y3QgdHJhY2VfZmlsZQogfQog CiAvKiBUaGlzIGlzIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiB0cmFjZV9maWxl X3dyaXRlX29wcyBtZXRob2QKKyAgIHdyaXRlX2RlZmF1bHRfY29sbGVjdC4g ICovCisKK3N0YXRpYyB2b2lkCitjdGZfd3JpdGVfZGVmYXVsdF9jb2xsZWN0 IChzdHJ1Y3QgdHJhY2VfZmlsZV93cml0ZXIgKnNlbGYsCisJCQkgICBjaGFy ICpjb2xsZWN0KQoreworICAvKiBJdCBpcyBub3Qgc3VwcG9ydGVkIHlldCB0 byB3cml0ZSBkZWZhdWx0IGNvbGxlY3QKKyAgICAgaW50byBDVEYgdHJhY2Ug ZGF0YS4gICovCit9CisKKy8qIFRoaXMgaXMgdGhlIGltcGxlbWVudGF0aW9u IG9mIHRyYWNlX2ZpbGVfd3JpdGVfb3BzIG1ldGhvZAogICAgd3JpdGVfZGVm aW5pdGlvbl9lbmQuICAqLwogCiBzdGF0aWMgdm9pZApAQCAtODQ4LDYgKzg1 OSw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgdHJhY2VfZmlsZV93cml0ZV9v 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 eSk7CiB9CiAKQEAgLTQyOTcsNyArNDMxOCw3IEBAIHRmaWxlX29wZW4gKGNo YXIgKmZpbGVuYW1lLCBpbnQgZnJvbV90dHkKIAogc3RhdGljIHZvaWQKIHRm aWxlX2ludGVycF9saW5lIChjaGFyICpsaW5lLCBzdHJ1Y3QgdXBsb2FkZWRf dHAgKip1dHBwLAotCQkgICBzdHJ1Y3QgdXBsb2FkZWRfdHN2ICoqdXRzdnAp CisJCSAgIHN0cnVjdCB1cGxvYWRlZF90c3YgKip1dHN2cCwgY2hhciAqKmNv bGxlY3RwKQogewogICBjaGFyICpwID0gbGluZTsKIApAQCAtNDMyMSw2ICs0 MzQyLDExIEBAIHRmaWxlX2ludGVycF9saW5lIChjaGFyICpsaW5lLCBzdHJ1 Y3QgdXAKICAgICAgIHAgKz0gc3RybGVuICgidHN2ICIpOwogICAgICAgcGFy c2VfdHN2X2RlZmluaXRpb24gKHAsIHV0c3ZwKTsKICAgICB9CisgIGVsc2Ug aWYgKHN0cm5jbXAgKHAsICJkYyAiLCBzdHJsZW4gKCJkYyAiKSkgPT0gMCkK KyAgICB7CisgICAgICBwICs9IHN0cmxlbiAoImRjICIpOworICAgICAgKmNv bGxlY3RwID0geHN0cmR1cCAocCk7CisgICAgfQogICBlbHNlCiAgICAgd2Fy bmluZyAoXygiSWdub3JpbmcgdHJhY2UgZmlsZSBkZWZpbml0aW9uIFwiJXNc IiIpLCBsaW5lKTsKIH0KLS0tIGEvdHJhY2Vwb2ludC5oCisrKyBiL3RyYWNl cG9pbnQuaApAQCAtMjk2LDYgKzI5NiwxMCBAQCBzdHJ1Y3QgdHJhY2VfZmls ZV93cml0ZV9vcHMKICAgdm9pZCAoKndyaXRlX3VwbG9hZGVkX3RwKSAoc3Ry dWN0IHRyYWNlX2ZpbGVfd3JpdGVyICpzZWxmLAogCQkJICAgICBzdHJ1Y3Qg dXBsb2FkZWRfdHAgKnRwKTsKIAorICAvKiBXcml0ZSB0aGUgdHJhY2Vwb2lu dCBkZWZhdWx0IGNvbGxlY3QuICAqLworICB2b2lkICgqd3JpdGVfZGVmYXVs dF9jb2xsZWN0KSAoc3RydWN0IHRyYWNlX2ZpbGVfd3JpdGVyICpzZWxmLAor CQkJCSBjaGFyICpjb2xsZWN0KTsKKwogICAvKiBXcml0ZSB0byBtYXJrIHRo ZSBlbmQgb2YgdGhlIGRlZmluaXRpb24gcGFydC4gICovCiAgIHZvaWQgKCp3 cml0ZV9kZWZpbml0aW9uX2VuZCkgKHN0cnVjdCB0cmFjZV9maWxlX3dyaXRl ciAqc2VsZik7CiAK --e89a8ff1cf6c1f394b04da770817--