| Message ID | 1383649051-6289-1-git-send-email-oscar.mateo@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Nov 05, 2013 at 10:57:31AM +0000, oscar.mateo@intel.com wrote: > From: Oscar Mateo <oscar.mateo@intel.com> > > Same thing that was done for prime_self_import. > > v2: Move igt_drop_caches_set() call inside get_object_count() to make > it clearer why we want this. > > Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> Both merged, thanks for the patches. -Daniel > --- > tests/gem_flink_race.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c > index b81007e..195ec15 100644 > --- a/tests/gem_flink_race.c > +++ b/tests/gem_flink_race.c > @@ -35,6 +35,7 @@ > #include "drmtest.h" > #include "i915_drm.h" > #include "intel_bufmgr.h" > +#include "igt_debugfs.h" > > /* Testcase: check for flink/open vs. gem close races > * > @@ -54,6 +55,8 @@ static int get_object_count(void) > int device = drm_get_card(); > char *path; > > + igt_drop_caches_set(DROP_RETIRE); > + > ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_gem_objects", device); > igt_assert(ret != -1); > > @@ -157,9 +160,11 @@ static void test_flink_close(void) > { > pthread_t *threads; > int r, i, num_threads; > - int obj_count = get_object_count(); > + int obj_count; > void *status; > > + obj_count = get_object_count(); > + > num_threads = sysconf(_SC_NPROCESSORS_ONLN); > > threads = calloc(num_threads, sizeof(pthread_t)); > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c index b81007e..195ec15 100644 --- a/tests/gem_flink_race.c +++ b/tests/gem_flink_race.c @@ -35,6 +35,7 @@ #include "drmtest.h" #include "i915_drm.h" #include "intel_bufmgr.h" +#include "igt_debugfs.h" /* Testcase: check for flink/open vs. gem close races * @@ -54,6 +55,8 @@ static int get_object_count(void) int device = drm_get_card(); char *path; + igt_drop_caches_set(DROP_RETIRE); + ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_gem_objects", device); igt_assert(ret != -1); @@ -157,9 +160,11 @@ static void test_flink_close(void) { pthread_t *threads; int r, i, num_threads; - int obj_count = get_object_count(); + int obj_count; void *status; + obj_count = get_object_count(); + num_threads = sysconf(_SC_NPROCESSORS_ONLN); threads = calloc(num_threads, sizeof(pthread_t));