DAOS-3114 vos: Consolidate timestamp cache APIs

ci/unit/test_main_node.sh

@@ -3,7 +3,7 @@
 # This is a script to be run by the unit/test_main.sh to run a test
 # on a CI node.
 
-set -ex
+set -x
 
 sudo bash -c 'echo 1 > /proc/sys/kernel/sysrq'
 if grep /mnt/daos\  /proc/mounts; then

src/common/mem.c

@@ -263,6 +263,15 @@ pmem_tx_commit(struct umem_instance *umm)
 	return rc ? umem_tx_errno(rc) : 0;
 }
 
+static void
+pmem_defer_free(struct umem_instance *umm, umem_off_t off,
+		struct pobj_action *act)
+{
+	PMEMoid	id = umem_off2id(umm, off);
+
+	pmemobj_defer_free(umm->umm_pool, id, act);
+}
+
 static umem_off_t
 pmem_reserve(struct umem_instance *umm, struct pobj_action *act, size_t size,
 	     unsigned int type_num)
@@ -359,6 +368,7 @@ static umem_ops_t	pmem_ops = {
 	.mo_tx_begin		= pmem_tx_begin,
 	.mo_tx_commit		= pmem_tx_commit,
 	.mo_reserve		= pmem_reserve,
+	.mo_defer_free		= pmem_defer_free,
 	.mo_cancel		= pmem_cancel,
 	.mo_tx_publish		= pmem_tx_publish,
 	.mo_tx_add_callback	= pmem_tx_add_callback,

src/container/cli_internal.h

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2016 Intel Corporation.
+ * (C) Copyright 2016-2020 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/include/daos/mem.h

@@ -232,6 +232,18 @@ typedef struct {
 				       struct pobj_action *act, size_t size,
 				       unsigned int type_num);
 
+	/**
+	 * Defer free til commit.  For use with reserved extents that are not
+	 * yet published.  For VMEM, it just calls free.
+	 *
+	 * \param umm	[IN]		umem class instance.
+	 * \param off	[IN]		offset of allocation
+	 * \param act	[IN|OUT]	action used for later cancel/publish.
+	 */
+	void		 (*mo_defer_free)(struct umem_instance *umm,
+					  umem_off_t off,
+					  struct pobj_action *act);
+
 	/**
 	 * Cancel the reservation.
 	 *
@@ -494,6 +506,20 @@ umem_reserve(struct umem_instance *umm, struct pobj_action *act, size_t size)
 	return UMOFF_NULL;
 }
 
+static inline void
+umem_defer_free(struct umem_instance *umm, umem_off_t off,
+		struct pobj_action *act)
+{
+	if (umm->umm_ops->mo_defer_free)
+		return umm->umm_ops->mo_defer_free(umm, off, act);
+
+	/** Go ahead and free immediately.  The purpose of this function
+	 *  is to allow reserve/publish pair to execute on commit
+	 */
+	umem_free(umm, off);
+}
+
+
 static inline void
 umem_cancel(struct umem_instance *umm, struct pobj_action *actv, int actv_cnt)
 {

src/include/daos_obj_class.h

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2015-2019 Intel Corporation.
+ * (C) Copyright 2015-2020 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/tests/suite/daos_test.c

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2016-2019 Intel Corporation.
+ * (C) Copyright 2016-2020 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.