refs #5351 have the locktree link with portability and ft and make sure a...

refs #5351 have the locktree link with portability and ft and make sure a printf uses a portable format specifier


git-svn-id: file:///svn/toku/tokudb@49888 c7de825b-a66e-492c-adef-691d508d4ae1

locktree/CMakeLists.txt

@@ -19,6 +19,10 @@ add_dependencies(locktree install_tdb_h)
 add_library(locktree_static STATIC ${locktree_srcs})
 add_space_separated_property(TARGET locktree_static COMPILE_FLAGS "-fvisibility=hidden -fPIC")
 add_dependencies(locktree_static install_tdb_h)
+# The locktree uses the standard portability layer and also the ybt 
+# functions from the ft layer. Maybe one day the ybt functions will be
+# elsewhere.
+target_link_libraries(locktree LINK_PRIVATE ft ${LIBTOKUPORTABILITY})
 
 maybe_add_gcov_to_libraries(locktree locktree_static)
 

locktree/tests/locktree_simple_lock.cc

@@ -140,7 +140,7 @@ void locktree_unit_test::test_simple_lock(void) {
         invariant(r == 0);
     }
     t1 = current_time_usec();
-    printf("%ld locks acquired in %zd usec, %lf locks/sec\n",
+    printf(PRId64 " locks acquired in %zd usec, %lf locks/sec\n",
             num_locks, t1 - t0, num_locks / ((t1 - t0*1.0) / 1000000));
 
     t0 = current_time_usec();
@@ -149,7 +149,7 @@ void locktree_unit_test::test_simple_lock(void) {
         lt->remove_overlapping_locks_for_txnid(txnid_a, &k, &k);
     }
     t1 = current_time_usec();
-    printf("%ld locks released in %zd usec, %lf locks/sec\n",
+    printf(PRId64 " locks released in %zd usec, %lf locks/sec\n",
             num_locks, t1 - t0, num_locks / ((t1 - t0*1.0) / 1000000));
 
     toku_free(keys);