From ffbae880f2d955e8ea664ae0f6bbd1f128ccfb16 Mon Sep 17 00:00:00 2001
From: "Tate, Hongliang Tian" <tate.thl@antfin.com>
Date: Fri, 5 Jun 2020 03:44:32 +0000
Subject: [PATCH] Reorder the config entries in Occlum.json

Not all config entries are created equal: some are more likely to be
customized by users, some are not so often. This commit reorders the
config entries in descending order of expected popularity.
---
 etc/template/Occlum.json | 22 +++++++++++-----------
 test/Occlum.json         | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/etc/template/Occlum.json b/etc/template/Occlum.json
index f6de9e97..d62a8d39 100644
--- a/etc/template/Occlum.json
+++ b/etc/template/Occlum.json
@@ -1,20 +1,18 @@
 {
-    "metadata": {
-        "product_id": 0,
-        "version_number": 0,
-        "debuggable": true
-    },
     "resource_limits": {
-        "max_num_of_threads": 32,
+        "user_space_size": "256MB",
         "kernel_space_heap_size": "32MB",
         "kernel_space_stack_size": "1MB",
-        "user_space_size": "256MB"
+        "max_num_of_threads": 32
     },
     "process": {
         "default_stack_size": "4MB",
         "default_heap_size": "32MB",
         "default_mmap_size": "80MB"
     },
+    "entry_points": [
+        "/bin"
+    ],
     "env": {
         "default": [
             "OCCLUM=yes"
@@ -23,9 +21,11 @@
             "EXAMPLE"
         ]
     },
-    "entry_points": [
-        "/bin"
-    ],
+    "metadata": {
+        "product_id": 0,
+        "version_number": 0,
+        "debuggable": true
+    },
     "mount": [
         {
             "target": "/",
@@ -49,4 +49,4 @@
             "type": "ramfs"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/test/Occlum.json b/test/Occlum.json
index cfc6da85..f6b9a77b 100644
--- a/test/Occlum.json
+++ b/test/Occlum.json
@@ -1,20 +1,18 @@
 {
-    "metadata": {
-        "product_id": 0,
-        "version_number": 0,
-        "debuggable": true
-    },
     "resource_limits": {
-        "max_num_of_threads": 32,
         "kernel_space_heap_size": "32MB",
         "kernel_space_stack_size": "1MB",
-        "user_space_size": "128MB"
+        "user_space_size": "128MB",
+        "max_num_of_threads": 32
     },
     "process": {
         "default_stack_size": "4MB",
         "default_heap_size": "8MB",
         "default_mmap_size": "32MB"
     },
+    "entry_points": [
+        "/bin"
+    ],
     "env": {
         "default": [
             "OCCLUM=yes",
@@ -26,9 +24,11 @@
             "OVERRIDE"
         ]
     },
-    "entry_points": [
-        "/bin"
-    ],
+    "metadata": {
+        "product_id": 0,
+        "version_number": 0,
+        "debuggable": true
+    },
     "mount": [
         {
             "target": "/",