|
 |
b79ac1 |
From 56134ff5442bee4e128b189bb86cfc97dcb6f60a Mon Sep 17 00:00:00 2001
|
|
|
b79ac1 |
From: Petr Machata <pmachata@redhat.com>
|
|
|
b79ac1 |
Date: Fri, 10 Jan 2014 20:05:15 +0100
|
|
|
b79ac1 |
Subject: [PATCH 1/2] Add a new per-breakpoint callback on_install
|
|
|
b79ac1 |
|
|
|
b79ac1 |
---
|
|
|
b79ac1 |
breakpoint.h | 9 ++++++++-
|
|
|
b79ac1 |
breakpoints.c | 11 ++++++++++-
|
|
|
b79ac1 |
2 files changed, 18 insertions(+), 2 deletions(-)
|
|
|
b79ac1 |
|
|
|
b79ac1 |
diff --git a/breakpoint.h b/breakpoint.h
|
|
|
b79ac1 |
index 95964a8..c36f673 100644
|
|
|
b79ac1 |
--- a/breakpoint.h
|
|
|
b79ac1 |
+++ b/breakpoint.h
|
|
|
b79ac1 |
@@ -1,6 +1,6 @@
|
|
|
b79ac1 |
/*
|
|
|
b79ac1 |
* This file is part of ltrace.
|
|
|
b79ac1 |
- * Copyright (C) 2012, 2013 Petr Machata, Red Hat Inc.
|
|
|
b79ac1 |
+ * Copyright (C) 2012,2013,2014 Petr Machata, Red Hat Inc.
|
|
|
b79ac1 |
* Copyright (C) 2009 Juan Cespedes
|
|
|
b79ac1 |
*
|
|
|
b79ac1 |
* This program is free software; you can redistribute it and/or
|
|
|
b79ac1 |
@@ -46,6 +46,7 @@
|
|
|
b79ac1 |
struct bp_callbacks {
|
|
|
b79ac1 |
void (*on_hit)(struct breakpoint *bp, struct process *proc);
|
|
|
b79ac1 |
void (*on_continue)(struct breakpoint *bp, struct process *proc);
|
|
|
b79ac1 |
+ void (*on_install)(struct breakpoint *bp, struct process *proc);
|
|
|
b79ac1 |
void (*on_retract)(struct breakpoint *bp, struct process *proc);
|
|
|
b79ac1 |
|
|
|
b79ac1 |
/* Create a new breakpoint that should handle return from the
|
|
|
b79ac1 |
@@ -84,6 +85,12 @@ void breakpoint_on_continue(struct breakpoint *bp, struct process *proc);
|
|
|
b79ac1 |
* the instruction underneath it). */
|
|
|
b79ac1 |
void breakpoint_on_retract(struct breakpoint *bp, struct process *proc);
|
|
|
b79ac1 |
|
|
|
b79ac1 |
+/* Call ON_INSTALL handler of BP, if any is set. This should be
|
|
|
b79ac1 |
+ * called after the breakpoint is enabled for the first time, not
|
|
|
b79ac1 |
+ * every time it's enabled (such as after stepping over a site of a
|
|
|
b79ac1 |
+ * temporarily disabled breakpoint). */
|
|
|
b79ac1 |
+void breakpoint_on_install(struct breakpoint *bp, struct process *proc);
|
|
|
b79ac1 |
+
|
|
|
b79ac1 |
/* Call GET_RETURN_BP handler of BP, if any is set. If none is set,
|
|
|
b79ac1 |
* call CREATE_DEFAULT_RETURN_BP to obtain one. */
|
|
|
b79ac1 |
int breakpoint_get_return_bp(struct breakpoint **ret,
|
|
|
b79ac1 |
diff --git a/breakpoints.c b/breakpoints.c
|
|
|
b79ac1 |
index 947cb71..c3fa275 100644
|
|
|
b79ac1 |
--- a/breakpoints.c
|
|
|
b79ac1 |
+++ b/breakpoints.c
|
|
|
b79ac1 |
@@ -1,6 +1,6 @@
|
|
|
b79ac1 |
/*
|
|
|
b79ac1 |
* This file is part of ltrace.
|
|
|
b79ac1 |
- * Copyright (C) 2006,2007,2011,2012,2013 Petr Machata, Red Hat Inc.
|
|
|
b79ac1 |
+ * Copyright (C) 2006,2007,2011,2012,2013,2014 Petr Machata, Red Hat Inc.
|
|
|
b79ac1 |
* Copyright (C) 2009 Juan Cespedes
|
|
|
b79ac1 |
* Copyright (C) 1998,2001,2002,2003,2007,2008,2009 Juan Cespedes
|
|
|
b79ac1 |
* Copyright (C) 2006 Ian Wienand
|
|
|
b79ac1 |
@@ -85,6 +85,14 @@ breakpoint_on_retract(struct breakpoint *bp, struct process *proc)
|
|
|
b79ac1 |
(bp->cbs->on_retract)(bp, proc);
|
|
|
b79ac1 |
}
|
|
|
b79ac1 |
|
|
|
b79ac1 |
+void
|
|
|
b79ac1 |
+breakpoint_on_install(struct breakpoint *bp, struct process *proc)
|
|
|
b79ac1 |
+{
|
|
|
b79ac1 |
+ assert(bp != NULL);
|
|
|
b79ac1 |
+ if (bp->cbs != NULL && bp->cbs->on_install != NULL)
|
|
|
b79ac1 |
+ (bp->cbs->on_install)(bp, proc);
|
|
|
b79ac1 |
+}
|
|
|
b79ac1 |
+
|
|
|
b79ac1 |
int
|
|
|
b79ac1 |
breakpoint_get_return_bp(struct breakpoint **ret,
|
|
|
b79ac1 |
struct breakpoint *bp, struct process *proc)
|
|
|
b79ac1 |
@@ -229,6 +237,7 @@ breakpoint_turn_on(struct breakpoint *bp, struct process *proc)
|
|
|
b79ac1 |
if (bp->enabled == 1) {
|
|
|
b79ac1 |
assert(proc->pid != 0);
|
|
|
b79ac1 |
enable_breakpoint(proc, bp);
|
|
|
b79ac1 |
+ breakpoint_on_install(bp, proc);
|
|
|
b79ac1 |
}
|
|
|
b79ac1 |
return 0;
|
|
|
b79ac1 |
}
|
|
|
b79ac1 |
--
|
|
|
b79ac1 |
1.7.6.5
|
|
|
b79ac1 |
|