aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <psyeugenic@gmail.com>2010-04-21 16:09:14 +0200
committerRaimo Niskanen <raimo@erlang.org>2010-06-03 14:54:20 +0200
commit35fc33a60608c160f20387840fa6317b09d05d7b (patch)
tree94caae56dfbc35891fee5035c4d5e96d9d80009b /erts
parent78d5145d68783dca4aa43bfd38fb9afecc59c416 (diff)
downloadotp-35fc33a60608c160f20387840fa6317b09d05d7b.tar.gz
otp-35fc33a60608c160f20387840fa6317b09d05d7b.tar.bz2
otp-35fc33a60608c160f20387840fa6317b09d05d7b.zip
Fix set_function_break to use correct breakpoint
op_i_time_breakpoint is now used
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/beam_bp.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index f264ebfa3f..7c85885fa2 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -129,14 +129,14 @@ static int clear_function_break(Module *modp, BeamInstr *pc,
static BpData *is_break(BeamInstr *pc, BeamInstr break_op);
/* bp_hash */
-#define BP_TIME_ADD(pi0, pi1) \
- do { \
- Uint r; \
- (pi0)->count += (pi1)->count; \
- (pi0)->s_time += (pi1)->s_time; \
- (pi0)->us_time += (pi1)->us_time; \
- r = (pi0)->us_time / 1000000; \
- (pi0)->s_time += r; \
+#define BP_TIME_ADD(pi0, pi1) \
+ do { \
+ Uint r; \
+ (pi0)->count += (pi1)->count; \
+ (pi0)->s_time += (pi1)->s_time; \
+ (pi0)->us_time += (pi1)->us_time; \
+ r = (pi0)->us_time / 1000000; \
+ (pi0)->s_time += r; \
(pi0)->us_time = (pi0)->us_time % 1000000; \
} while(0)
@@ -809,7 +809,7 @@ static int set_function_break(Module *modp, BeamInstr *pc,
bdc->count = 0; /* Reset call counter */
}
ErtsSmpBPUnlock(bdc);
- } else if (break_op == (Uint) BeamOp(op_i_count_breakpoint)) {
+ } else if (break_op == (Uint) BeamOp(op_i_time_breakpoint)) {
BpDataTime *bdt = (BpDataTime *) bd;
Uint i = 0;