From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26715 invoked by alias); 3 Sep 2014 23:44:46 -0000 Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org Received: (qmail 26705 invoked by uid 89); 3 Sep 2014 23:44:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.7 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 03 Sep 2014 23:44:44 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s83Nihcp021291 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 3 Sep 2014 19:44:43 -0400 Received: from moya.redhat.com (ovpn-113-122.phx2.redhat.com [10.3.113.122]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s83Nighj020410; Wed, 3 Sep 2014 19:44:42 -0400 From: Josh Stone To: systemtap@sourceware.org Cc: jlebon@redhat.com, stefanha@redhat.com, fche@redhat.com, Josh Stone Subject: [PATCH] Remove systemtap_session::built_uprobes Date: Wed, 03 Sep 2014 23:44:00 -0000 Message-Id: <1409787870-24810-1-git-send-email-jistone@redhat.com> In-Reply-To: <5407A2B9.5030903@redhat.com> References: <5407A2B9.5030903@redhat.com> X-IsSubscribed: yes X-SW-Source: 2014-q3/txt/msg00225.txt.bz2 For the purpose of save_uprobes, it doesn't actually matter whether uprobes.ko was just built or was pulled from the cache. If we have the uprobes_path at all, go ahead and save it. --- buildrun.cxx | 4 +--- main.cxx | 2 +- session.cxx | 2 -- session.h | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/buildrun.cxx b/buildrun.cxx index 67217c3459e5..5d3ab582c058 100644 --- a/buildrun.cxx +++ b/buildrun.cxx @@ -602,10 +602,8 @@ make_uprobes (systemtap_session& s) clog << _("uprobes rebuild exit code: ") << rc << endl; if (rc) s.set_try_server (); - else { + else s.uprobes_path = dir + "/uprobes.ko"; - s.built_uprobes = true; - } return rc; } diff --git a/main.cxx b/main.cxx index af4be20aa6bf..f88701cba1b8 100644 --- a/main.cxx +++ b/main.cxx @@ -990,7 +990,7 @@ passes_0_4 (systemtap_session &s) } // Copy uprobes module to the current directory. - if (s.save_uprobes && s.built_uprobes && !pending_interrupts) + if (s.save_uprobes && !s.uprobes_path.empty() && !pending_interrupts) { rc = create_dir("uprobes"); if (! rc) diff --git a/session.cxx b/session.cxx index e2a518ba0538..ee4e81b72e31 100644 --- a/session.cxx +++ b/session.cxx @@ -145,7 +145,6 @@ systemtap_session::systemtap_session (): need_uprobes = false; need_unwind = false; need_symbols = false; - built_uprobes = false; uprobes_path = ""; load_only = false; skip_badvars = false; @@ -327,7 +326,6 @@ systemtap_session::systemtap_session (const systemtap_session& other, need_uprobes = false; need_unwind = false; need_symbols = false; - built_uprobes = false; uprobes_path = ""; load_only = other.load_only; skip_badvars = other.skip_badvars; diff --git a/session.h b/session.h index e92fff167e88..63cacc997632 100644 --- a/session.h +++ b/session.h @@ -209,7 +209,6 @@ public: bool need_uprobes; bool need_unwind; bool need_symbols; - bool built_uprobes; std::string uprobes_path; std::string uprobes_hash; bool load_only; // flight recorder mode -- 1.9.3