zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-09 05:10:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made the behavior of the annotate_smart_pointer test program configurable

Browse Source 
through command-line arguments, and made sure that the annotations present
in the source code are recognized by all Valgrind-based data race detection
tools.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11067
This commit is contained in:
Bart Van Assche
2010-03-07 10:42:15 +00:00
parent 9ced7475c6
commit 016af749e0
2 changed files with 95 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drd/tests/annotate_smart_pointer.cpp
View File

@@ -27,7 +27,7 @@
#include <cassert> // assert()
#include <climits> // PTHREAD_STACK_MIN
#include <iostream> // std::cout
#include <iostream> // std::cerr
#include <stdlib.h> // atoi()
#ifdef _WIN32
#include <process.h> // _beginthreadex()
@@ -35,7 +35,10 @@
#else
#include <pthread.h> // pthread_mutex_t
#endif
#include "../../drd/drd.h"
#include "unified_annotations.h"
static bool s_enable_annotations = true;
#ifdef _WIN32
@@ -232,10 +235,15 @@ private:
{
if (m_count_ptr)
{
ANNOTATE_HAPPENS_BEFORE(m_count_ptr);
if (s_enable_annotations)
ANNOTATE_HAPPENS_BEFORE(m_count_ptr);
if (--(*m_count_ptr) == 0)
{
ANNOTATE_HAPPENS_AFTER(m_count_ptr);
if (s_enable_annotations)
{
ANNOTATE_HAPPENS_AFTER(m_count_ptr);
ANNOTATE_HAPPENS_DONE(m_count_ptr);
}
delete m_ptr;
m_ptr = NULL;
delete m_count_ptr;
@@ -300,17 +308,23 @@ static void* thread_func(void* arg)
int main(int argc, char** argv)
{
smart_ptr<counter> p(new counter);
const int nthreads = std::max(argc > 1 ? atoi(argv[1]) : 1, 1);
Thread T[nthreads];
const int iterations = std::max(argc > 2 ? atoi(argv[2]) : 1, 1);
s_enable_annotations = argc > 3 ? !!atoi(argv[3]) : true;
p->post_increment();
for (int i = 0; i < nthreads; ++i)
T[i].Create(thread_func, new smart_ptr<counter>(p));
p = NULL;
for (int i = 0; i < nthreads; ++i)
T[i].Join();
std::cout << "Done.\n";
for (int j = 0; j < iterations; ++j)
{
Thread T[nthreads];
smart_ptr<counter> p(new counter);
p->post_increment();
for (int i = 0; i < nthreads; ++i)
T[i].Create(thread_func, new smart_ptr<counter>(p));
p = NULL;
for (int i = 0; i < nthreads; ++i)
T[i].Join();
}
std::cerr << "Done.\n";
return 0;
}