[fzl] Clear free buffer list on re-init

Test: libfzl-test Change-Id: I63c6d9533e8823942441e9d66bee7653bf8647b0
simidagege · Sep 27, 2018 · e71529b · e71529b
1 parent 0ce697a
commit e71529b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/system/ulib/fzl/vmo-pool.cpp b/system/ulib/fzl/vmo-pool.cpp
@@ -26,6 +26,7 @@ zx_status_t VmoPool::Init(const zx::vmo* vmos, size_t num_vmos) {
         return ZX_ERR_NO_MEMORY;
     }
     buffers_ = fbl::move(buffers);
+    free_buffers_.clear_unsafe();
 
     zx_status_t status;
     for (size_t i = 0; i < num_vmos; ++i) {

diff --git a/system/utest/libfzl/vmo-pool-tests.cpp b/system/utest/libfzl/vmo-pool-tests.cpp
@@ -282,6 +282,17 @@ bool vmo_pool_reset_test() {
     END_TEST;
 }
 
+bool vmo_pool_reinit() {
+    BEGIN_TEST;
+    VmoPoolTester tester;
+    ASSERT_TRUE(tester.Init());
+    ASSERT_TRUE(tester.CheckAccounting(false, 0));
+
+    ASSERT_TRUE(tester.Init());
+    ASSERT_TRUE(tester.CheckAccounting(false, 0));
+    END_TEST;
+}
+
 } // namespace
 
 BEGIN_TEST_CASE(vmo_pool_tests)
@@ -292,4 +303,5 @@ RUN_NAMED_TEST("vmo_pool_release_wrong_buffer", vmo_pool_release_wrong_buffer_te
 RUN_NAMED_TEST("vmo_pool_release_before_complete", vmo_pool_release_before_complete_test)
 RUN_NAMED_TEST("vmo_pool_fill_and_empty_pool", vmo_pool_fill_and_empty_pool_test)
 RUN_NAMED_TEST("vmo_pool_out_of_order", vmo_pool_out_of_order_test)
+RUN_NAMED_TEST("vmo_pool_reinit", vmo_pool_reinit)
 END_TEST_CASE(vmo_pool_tests)