From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8362 invoked by alias); 21 Jun 2013 17:25:20 -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 8252 invoked by uid 89); 21 Jun 2013 17:25:17 -0000 X-Spam-SWARE-Status: No, score=-7.6 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 21 Jun 2013 17:25:16 +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 r5LHPFpZ003461 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 21 Jun 2013 13:25:15 -0400 Received: from barimba.redhat.com (ovpn-113-102.phx2.redhat.com [10.3.113.102]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5LHPBSw021447; Fri, 21 Jun 2013 13:25:15 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 06/16] push remote_traceframe_number into struct remote_state Date: Fri, 21 Jun 2013 17:25:00 -0000 Message-Id: <1371835506-15691-7-git-send-email-tromey@redhat.com> In-Reply-To: <1371835506-15691-1-git-send-email-tromey@redhat.com> References: <1371835506-15691-1-git-send-email-tromey@redhat.com> X-SW-Source: 2013-06/txt/msg00612.txt.bz2 This moves the global remote_traceframe_number into remote_state. * remote.c (struct remote_state) : New field. (remote_traceframe_number): Remove. (new_remote_state, remote_open_1, set_remote_traceframe) (remote_trace_find): Update. --- gdb/remote.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gdb/remote.c b/gdb/remote.c index 832c055..ba8cbfa 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -377,6 +377,10 @@ struct remote_state ptid_t general_thread; ptid_t continue_thread; + + /* This is the traceframe which we last selected on the remote system. + It will be -1 if no traceframe is selected. */ + int remote_traceframe_number; }; /* Private data that we'll store in (struct thread_info)->private. */ @@ -422,6 +426,7 @@ new_remote_state (void) result->buf_size = 400; result->buf = xmalloc (result->buf_size); + result->remote_traceframe_number = -1; return result; } @@ -1443,10 +1448,6 @@ static ptid_t magic_null_ptid; static ptid_t not_sent_ptid; static ptid_t any_thread_ptid; -/* This is the traceframe which we last selected on the remote system. - It will be -1 if no traceframe is selected. */ -static int remote_traceframe_number = -1; - /* Find out if the stub attached to PID (and hence GDB should offer to detach instead of killing it when bailing out). */ @@ -4344,7 +4345,7 @@ remote_open_1 (char *name, int from_tty, rs->general_thread = not_sent_ptid; rs->continue_thread = not_sent_ptid; - remote_traceframe_number = -1; + rs->remote_traceframe_number = -1; /* Probe for ability to use "ThreadInfo" query, as required. */ use_threadinfo_query = 1; @@ -6294,12 +6295,13 @@ static void set_remote_traceframe (void) { int newnum; + struct remote_state *rs = get_remote_state (); - if (remote_traceframe_number == get_traceframe_number ()) + if (rs->remote_traceframe_number == get_traceframe_number ()) return; /* Avoid recursion, remote_trace_find calls us again. */ - remote_traceframe_number = get_traceframe_number (); + rs->remote_traceframe_number = get_traceframe_number (); newnum = target_trace_find (tfind_number, get_traceframe_number (), 0, 0, NULL); @@ -11006,7 +11008,7 @@ remote_trace_find (enum trace_find_type type, int num, if (tpp) *tpp = target_tracept; - remote_traceframe_number = target_frameno; + rs->remote_traceframe_number = target_frameno; return target_frameno; } -- 1.8.1.4