cleanup: simpler, smaller, uniformity, code style

Author: Andy Rudoff

chapter10/.gitignore

@@ -0,0 +1,5 @@
+pmem_allocator
+pmem_config
+pmem_detect_kind
+vector_of_strings
+vmemcache

chapter10/Makefile

@@ -28,9 +28,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-CC = gcc
-CXX = g++
-RM = rm -f
+#
+# Makefile for chapter10 examples
+#
 
 TARGETS = pmem_allocator vector_of_strings pmem_config pmem_detect_kind vmemcache
 TARGETS_LISTINGS = $(addsuffix .lst, $(TARGETS))
@@ -39,12 +39,10 @@ all: $(TARGETS) listings
 listings: $(TARGETS_LISTINGS)
 
 %.lst: %.cpp
-	sed -i 's/\t/    /g' $^
-	cat -n $^ > $@
+	expand -t 4 < $^ | cat -n > $@
 
 %.lst: %.c
-	sed -i 's/\t/    /g' $^
-	cat -n $^ > $@
+	expand -t 4 < $^ | cat -n > $@
 
 %: %.cpp
 	$(CXX) -g -o $@ $< -lmemkind -std=c++11
@@ -53,5 +51,9 @@ listings: $(TARGETS_LISTINGS)
 	$(CC) -g -o $@ $< -lmemkind -lvmemcache
 
 clean:
+	$(RM) *.o core a.out
+
+clobber: clean
 	$(RM) $(TARGETS) $(TARGETS_LISTINGS)
 
+.PHONY: all clean clobber listings

chapter10/pmem_allocator.cpp

@@ -31,31 +31,30 @@
  */
 
 /*
- * pmem_allocator.cpp - Demonstrates using the 
- *                 pmem::allocator 
- *                         with std:vector.
+ * pmem_allocator.cpp - pmem::allocator with std:vector
  */
 
 #include <pmem_allocator.h>
 #include <vector>
 #include <cassert>
- 
+
 int main(int argc, char *argv[]) {
-    const size_t pmem_max_size = 64*1024*1024; //64 MB
-    const std::string pmem_dir("/pmemfs/");
-    
-    // Create allocator object
-    libmemkind::pmem::allocator<int> alc(pmem_dir, 
-    pmem_max_size);
-    // Create std::vector with our allocator.
-    std::vector<int, libmemkind::pmem::allocator<int> 
-    > v(alc);
-    
-    for(int i = 0; i < 100; ++i)
-        v.push_back(i);
-    
-    for(int i = 0; i < 100; ++i)
-        assert(v[i] == i);
-    
-    return 0;
+	const size_t pmem_max_size = 64 * 1024 * 1024; //64 MB
+	const std::string pmem_dir("/daxfs");
+
+	// Create allocator object
+	libmemkind::pmem::allocator<int>
+		alc(pmem_dir, pmem_max_size);
+
+	// Create std::vector with our allocator.
+	std::vector<int,
+		libmemkind::pmem::allocator<int>> v(alc);
+
+	for (int i = 0; i < 100; ++i)
+		v.push_back(i);
+
+	for (int i = 0; i < 100; ++i)
+		assert(v[i] == i);
+
+	exit(0);
 }

chapter10/pmem_config.c

@@ -30,11 +30,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* 
- * pmem_config.c - Demonstrates the use of several 
- *            configuration functions within 
- *            libmemkind.
- */ 
+/*
+ * pmem_config.c - demonstrate configuration functions
+ */
 
 #include <memkind.h>
 
@@ -44,72 +42,60 @@
 
 #define PMEM_MAX_SIZE (1024 * 1024 * 32)
 
-static char path[PATH_MAX] = "pmemfs//";
+char path[PATH_MAX] = "/daxfs";
 
-static void print_err_message(int err)
+void memkind_fatal(int err)
 {
-    char error_message[MEMKIND_ERROR_MESSAGE_SIZE];
-    memkind_error_message(err, error_message, 
-        MEMKIND_ERROR_MESSAGE_SIZE);
-    fprintf(stderr, "%s\n", error_message);
+	char error_message[MEMKIND_ERROR_MESSAGE_SIZE];
+
+	memkind_error_message(err, error_message,
+		MEMKIND_ERROR_MESSAGE_SIZE);
+	fprintf(stderr, "%s\n", error_message);
+	exit(1);
 }
 
 int main(int argc, char *argv[])
 {
-    struct memkind *pmem_kind = NULL;
-    int err = 0;
-
-    if (argc > 2) {
-        fprintf(stderr, 
-            "Usage: %s [pmem_kind_dir_path]\n", 
-            argv[0]);
-        return 1;
-    } else if (argc == 2 && 
-        (realpath(argv[1], path) == NULL)) {
-        fprintf(stderr, 
-            "Incorrect pmem_kind_dir_path %s\n", 
-            argv[1]);
-        return 1;
-    }
-
-    fprintf(stdout,
-            "This example shows how to use custom "
-            "configuration to create pmem kind."
-            "\nPMEM kind directory: %s\n", path);
-
-    struct memkind_config *test_cfg =     
-        memkind_config_new();
-    if (!test_cfg) {
-        fprintf(stderr, 
-            "Unable to create memkind cfg.\n");
-        return 1;
-    }
-
-    memkind_config_set_path(test_cfg, path);
-    memkind_config_set_size(test_cfg, PMEM_MAX_SIZE);
-    memkind_config_set_memory_usage_policy(test_cfg,
-        MEMKIND_MEM_USAGE_POLICY_CONSERVATIVE);
-
-
-    // Create PMEM partition with the configuration
-    err =  memkind_create_pmem_with_config(test_cfg, 
-        &pmem_kind);
-    if (err) {
-        print_err_message(err);
-        return 1;
-    }
-
-    err = memkind_destroy_kind(pmem_kind);
-    if (err) {
-        print_err_message(err);
-        return 1;
-    }
-
-    memkind_config_delete(test_cfg);
-
-    fprintf(stdout,
-        "PMEM kind and configuration was successfully"
-        " created and destroyed.\n");
-
-    return 0;
+	struct memkind *pmem_kind;
+	int err;
+
+	if (argc > 2) {
+		fprintf(stderr,
+			"Usage: %s [pmem_kind_dir_path]\n",
+			argv[0]);
+		exit(1);
+	} else if (argc == 2 &&
+		(realpath(argv[1], path) == NULL)) {
+		perror(argv[1]);
+		exit(1);
+	}
+
+	struct memkind_config *test_cfg =
+		memkind_config_new();
+	if (test_cfg == NULL) {
+		fprintf(stderr,
+			"memkind_config_new: out of memory\n");
+		exit(1);
+	}
+
+	memkind_config_set_path(test_cfg, path);
+	memkind_config_set_size(test_cfg, PMEM_MAX_SIZE);
+	memkind_config_set_memory_usage_policy(test_cfg,
+		MEMKIND_MEM_USAGE_POLICY_CONSERVATIVE);
+
+	// Create PMEM partition with the configuration
+	err =  memkind_create_pmem_with_config(test_cfg,
+		&pmem_kind);
+	if (err) {
+		memkind_fatal(err);
+	}
+
+	err = memkind_destroy_kind(pmem_kind);
+	if (err) {
+		memkind_fatal(err);
+	}
+
+	memkind_config_delete(test_cfg);
+
+	exit(0);
 }