tableprinter: renamed output_type -> fmt, changed bool default format

[libucw.git] / ucw / table-test-2.c

diff --git a/ucw/table-test-2.c b/ucw/table-test-2.c
index 49fce1db58270e41bfe7545c072ef6fd84688ee0..35688734e5852e293c0528b81e9a98ab3bcf25a0 100644 (file)
--- a/ucw/table-test-2.c
+++ b/ucw/table-test-2.c
@@ -14,47 +14,99 @@ enum test_table_cols {
   TEST_COL0_SIZE, TEST_COL1_TS
 };
 
-static struct table test_tbl = {
+static struct table_template test_tbl = {
   TBL_COLUMNS {
-    [TEST_COL0_SIZE] = TBL_COL_SIZE_FMT("size", 10, UNIT_BYTE),
+    [TEST_COL0_SIZE] = TBL_COL_SIZE_FMT("size", 15, SIZE_UNITS_FIXED | UNIT_SIZE_BYTE),
     [TEST_COL1_TS] = TBL_COL_TIMESTAMP("ts", 20),
     TBL_COL_END
   },
-  TBL_OUTPUT_HUMAN_READABLE,
+  TBL_FMT_HUMAN_READABLE,
 };
 
 static void do_test(void)
 {
   struct fastbuf *out;
   out = bfdopen_shared(1, 4096);
-  table_init(&test_tbl);
-  table_start(&test_tbl, out);
+  struct table *tbl = table_init(&test_tbl);
+  table_start(tbl, out);
 
   u64 test_time = 1403685533;
   s64 test_size = 4LU*(1024LU * 1024LU * 1024LU);
 
-  table_col_size(&test_tbl, TEST_COL0_SIZE, test_size);
-  table_col_timestamp(&test_tbl, TEST_COL1_TS, test_time);
-  table_end_row(&test_tbl);
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
 
-  test_tbl.column_order[TEST_COL0_SIZE].output_type = UNIT_KILOBYTE;
-  table_col_size(&test_tbl, TEST_COL0_SIZE, test_size);
-  table_col_timestamp(&test_tbl, TEST_COL1_TS, test_time);
-  table_end_row(&test_tbl);
+  tbl->column_order[TEST_COL0_SIZE].fmt = SIZE_UNITS_FIXED | SIZE_UNIT_KILOBYTE;
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
 
-  test_tbl.column_order[TEST_COL0_SIZE].output_type = UNIT_MEGABYTE;
-  table_col_size(&test_tbl, TEST_COL0_SIZE, test_size);
-  table_col_timestamp(&test_tbl, TEST_COL1_TS, test_time);
-  table_end_row(&test_tbl);
+  tbl->column_order[TEST_COL0_SIZE].fmt = SIZE_UNITS_FIXED | SIZE_UNIT_MEGABYTE;
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
 
-  test_tbl.column_order[TEST_COL0_SIZE].output_type = UNIT_GIGABYTE;
-  test_tbl.column_order[TEST_COL1_TS].output_type = TIMESTAMP_DATETIME;
-  table_col_size(&test_tbl, TEST_COL0_SIZE, test_size);
-  table_col_timestamp(&test_tbl, TEST_COL1_TS, test_time);
-  table_end_row(&test_tbl);
+  tbl->column_order[TEST_COL0_SIZE].fmt = SIZE_UNITS_FIXED | SIZE_UNIT_GIGABYTE;
+  tbl->column_order[TEST_COL1_TS].fmt = TIMESTAMP_DATETIME;
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
 
-  table_end(&test_tbl);
-  table_cleanup(&test_tbl);
+  test_size = test_size * 1024LU;
+  tbl->column_order[TEST_COL0_SIZE].fmt = SIZE_UNITS_FIXED | SIZE_UNIT_TERABYTE;
+  tbl->column_order[TEST_COL1_TS].fmt = TIMESTAMP_DATETIME;
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  table_end(tbl);
+  table_cleanup(tbl);
+
+  bclose(out);
+}
+
+static struct table_template test_tbl2 = {
+  TBL_COLUMNS {
+    [TEST_COL0_SIZE] = TBL_COL_SIZE_FMT("size", 15, SIZE_UNITS_FIXED | SIZE_UNIT_BYTE),
+    [TEST_COL1_TS] = TBL_COL_TIMESTAMP("ts", 20),
+    TBL_COL_END
+  },
+  TBL_FMT_HUMAN_READABLE,
+};
+
+static void do_test2(void)
+{
+  struct fastbuf *out;
+  out = bfdopen_shared(1, 4096);
+  struct table *tbl = table_init(&test_tbl2);
+  table_set_col_order_by_name(tbl, "");
+  const char *err = table_set_option_value(tbl, "cols", "size[kb],size[mb],size[gb],size[tb],ts[datetime],ts[timestamp]");
+  if(err) {
+    opt_failure("err in table_set_option_value: '%s'.", err);
+    abort();
+  }
+  table_start(tbl, out);
+
+  u64 test_time = 1403685533;
+  s64 test_size = 4LU*(1024LU * 1024LU * 1024LU);
+
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  test_size = test_size * 1024LU;
+
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  table_end(tbl);
+  table_cleanup(tbl);
 
   bclose(out);
 }
@@ -62,6 +114,8 @@ static void do_test(void)
 int main(int argc UNUSED, char **argv UNUSED)
 {
   do_test();
+  do_test2();
+
   return 0;
 }