fixup

Author: topointon-jump

src/util/shmem/fd_shmem_cfg

@@ -5,16 +5,14 @@
 
 SHMEM_PATH="${FD_SHMEM_PATH:-/mnt/.fd}"
 
-ALL_TYPES="gigantic huge normal"
+ALL_TYPES="gigantic huge"
 
 # Disabling SC2128, more context here -> https://stackoverflow.com/questions/35006457/choosing-between-0-and-bash-source
 #shellcheck disable=SC2128
 BIN=$(dirname -- "$BASH_SOURCE")
 NUMA_CNT=`$BIN/fd_shmem_ctl numa-cnt --log-path "" 2> /dev/null`
 
 get_page_size() {
-  if [ "$1" = "normal" ]; then
-    echo 4096
   elif [ "$1" = "huge" ]; then
     echo 2097152
   elif [ "$1" = "gigantic" ]; then
@@ -100,16 +98,7 @@ init() {
     # system DRAM (in the proc/meminfo total memory sense) for maximum
     # flexibility.  Since the pages themselves are large, the number of
     # inodes required in the mount is still quite small practically.
-    # For normal pages, we need to use a tmpfs.
     try_defrag_memory 2> /dev/null > /dev/null
-    if [ "$t" = "normal" ]; then
-      mount -v -t tmpfs tmpfs $MNT_PATH
-      if [ "$?" != "0" ]; then
-        echo "init $1 $2 $3: fail, mount failed"
-        echo "Do $0 help for help"
-        exit 1
-      fi
-    else
       msz=`awk '/^MemTotal:/ {print $2}' /proc/meminfo` # In KiB
       psz=`get_page_size $t`
       msz=$((psz*((1024*msz)/psz))) # Round down to whole pages to be on safe side
@@ -172,15 +161,6 @@ fini() {
 
 query() {
   echo ""
-  for t in $ALL_TYPES; do
-    if [ "$t" != "normal" ]; then
-      echo "$t pages:"
-      for((n=0;n<NUMA_CNT;n++)); do
-        echo -e "\tnuma $n: `get_page_total $t $n` total, `get_page_free $t $n` free"
-      done
-      echo ""
-    fi
-  done
   if [ -d $SHMEM_PATH ]; then
     echo "FD_SHMEM_PATH=$SHMEM_PATH"
     echo ""
@@ -204,12 +184,6 @@ alloc() {
   TYPE=$2
   NUMA=$3
 
-  if [ "$TYPE" = "normal" ]; then
-    echo "alloc $1 $2 $3: fail, normal pages do not require explicit allocation"
-    echo "Do $0 help for help"
-    exit 1
-  fi
-
   T=`get_page_total $TYPE $NUMA`
   F=`get_page_free  $TYPE $NUMA`
   if [ "$T" != "$F" ]; then
@@ -302,12 +276,11 @@ while [ $# -gt 0 ]; do
     echo ""
     echo "  alloc [PAGE_CNT] [PAGE_TYPE] [NUMA_NODE]"
     echo "  - Reserve [PAGE_CNT] [PAGE_TYPE] DRAM-backed pages on numa [NUMA_NODE]"
-    echo "    systemwide.  Does not apply to normal pages."
+    echo "    systemwide."
     echo "  - This likely needs to run as a superuser or with sudo."
     echo ""
     echo "  free [PAGE_TYPE] [NUMA_NODE]"
     echo "  - Equivalent to alloc 0 [PAGE_TYPE] [NUMA_NODE]."
-    echo "  - Does not apply to normal pages."
     echo "  - This likely needs to run as a superuser or with sudo."
     echo ""
     echo "  query"