From dab4897e809f77fa6d7574563a169f752dbef43d Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 4 Apr 2013 01:38:28 -0700 Subject: [PATCH] datarace: use variable-argument bug-printing --- datarace.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/datarace.cc b/datarace.cc index e6784984..9f75642e 100644 --- a/datarace.cc +++ b/datarace.cc @@ -150,16 +150,18 @@ bool checkDataRaces() */ void assert_race(struct DataRace *race) { - char buf[200]; - char *ptr = buf; - ptr += sprintf(ptr, "Data race detected @ address %p:\n", race->address); - ptr += sprintf(ptr, " Access 1: %5s in thread %2d @ clock %3u\n", + model->assert_bug( + "Data race detected @ address %p:\n" + " Access 1: %5s in thread %2d @ clock %3u\n" + " Access 2: %5s in thread %2d @ clock %3u", + race->address, race->isoldwrite ? "write" : "read", - id_to_int(race->oldthread), race->oldclock); - ptr += sprintf(ptr, " Access 2: %5s in thread %2d @ clock %3u", + id_to_int(race->oldthread), + race->oldclock, race->isnewwrite ? "write" : "read", - id_to_int(race->newaction->get_tid()), race->newaction->get_seq_number()); - model->assert_bug(buf); + id_to_int(race->newaction->get_tid()), + race->newaction->get_seq_number() + ); } /** This function does race detection for a write on an expanded record. */ -- 2.34.1