Merge branch 'Torchship:main' into main

Author: StraylightRunMOO

.github/workflows/build.yml

@@ -0,0 +1,46 @@
+name: Docker build and push to ECR
+
+on:
+  push:
+    branches:
+      - main
+
+env:
+  AWS_REGION: us-west-2
+  ECR_REPOSITORY: torchstunt
+  IMAGE_TAG: latest
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read    
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: arn:aws:iam::181720039072:role/GithubWorkflowActions
+          aws-region: us-west-2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}

.gitignore

@@ -10,6 +10,7 @@ version_src*.h
 keywords.c
 *.o
 moo
+bin
 \#*\#
 .\#*
 backups
@@ -21,7 +22,6 @@ xcode
 Makefile.in.bak
 keywords.cc
 build
-.vscode
 test/executables/true
 test/executables/sleep
 test/executables/echo

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug moo",
+      "type": "cppdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/moo",  // Path to your executable in the build folder
+      "args": ["Minimal.db", "Minimal.out.db"],    // Arguments for the program
+      "stopAtEntry": false,
+      "cwd": "${workspaceFolder}",
+      "environment": [],
+      "externalConsole": true,
+      "MIMode": "gdb",
+      "setupCommands": [
+        {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+        }
+      ],
+      "miDebuggerPath": "/usr/bin/gdb",  // Ensure gdb is installed
+      "preLaunchTask": "Build Project",  // This will trigger the build task before debugging
+      "miDebuggerArgs": "",
+      "serverLaunchTimeout": 10000
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "files.associations": {
+    "system_error": "cpp",
+    "regex": "cpp",
+    "map": "cpp",
+    "__tree": "cpp"
+  }
+}

.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Configure and Build Project",
+      "type": "shell",
+      "command": "cmake",
+      "args": [
+        "-B",
+        "build",
+        "-S",
+        "."
+      ],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": [
+        "$gcc"
+      ],
+      "detail": "Generated task for configuring the project with cmake"
+    },
+    {
+      "label": "Build Project",
+      "type": "shell",
+      "command": "make",
+      "args": [
+        "-C",
+        "build",
+        "-j2"
+      ],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": [
+        "$gcc"
+      ],
+      "detail": "Generated task for building the project in the build folder"
+    }
+  ]
+}

CMakeLists.txt

@@ -1,10 +1,19 @@
 cmake_minimum_required(VERSION 3.11)
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 7)
-set(VERSION_RELEASE 0)
+set(VERSION_RELEASE 1)
 set(VERSION_EXT "")
 project(ToastStunt VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE} LANGUAGES CXX C)
 
+# Compile Options
+option(ONLY_32_BITS "Use 32-bit integers instead of 64-bit." OFF)
+option(USE_JEMALLOC "Use jemalloc (if available) for memory allocation." OFF)
+
+# Fall back to 32-bit mode if the target doesn't support 64-bit
+if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+    set(ONLY_32_BITS true)
+endif()
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
 
 # Don't bother if we don't have these
@@ -43,14 +52,6 @@ else()
     endif()
 endif()
 
-# Compile Options
-option(ONLY_32_BITS "Use 32-bit integers instead of 64-bit." OFF)
-
-# Fall back to 32-bit mode if the target doesn't support 64-bit
-if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
-    set(ONLY_32_BITS true)
-endif()
-
 # Compiler Flags
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_C_STANDARD 17)
@@ -142,16 +143,15 @@ add_custom_command(
 # Find packages. We don't do anything with the information yet because we need to know if things exist
 #                to modify the source files, so we have to do it before moo is defined. But we can't
 #                do the package setup UNTIL moo is defined.
-set(SQL_FOUND FALSE)
-IF(APPLE_SILICON_FOUND)
+if(APPLE_SILICON_FOUND)
     set(CMAKE_THREAD_LIBS_INIT "-lpthread")
     set(CMAKE_HAVE_THREADS_LIBRARY 1)
     set(CMAKE_USE_WIN32_THREADS_INIT 0)
     set(CMAKE_USE_PTHREADS_INIT 1)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
-ELSE()
+else()
     find_package(Threads REQUIRED)
-ENDIF()
+endif()
 find_package(Nettle REQUIRED)
 find_package(Argon2 REQUIRED)
 find_package(PCRE)
@@ -163,6 +163,15 @@ find_package(MySQL)
 find_package(OpenSSL)
 find_package(Expat)
 
+if(USE_JEMALLOC)
+    find_library(JEMALLOC_LIBRARY NAMES jemalloc)
+    if(NOT JEMALLOC_LIBRARY)
+        message(WARNING "jemalloc library not found. Not using.")
+    else()
+        set(JEMALLOC_FOUND 1)
+    endif()
+endif()
+
 # Millions of source files
 set(src_CSRCS
     src/dependencies/thpool.c
@@ -310,6 +319,11 @@ if(OPENSSL_FOUND)
     target_link_libraries(moo ${OPENSSL_LIBRARIES})
 endif()
 
+if(JEMALLOC_FOUND)
+    include_directories(${JEMALLOC_INCLUDE_DIRS})
+    target_link_libraries(moo ${JEMALLOC_LIBRARY})
+endif()
+
 # Setup #defines as needed
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/src/include/config.h.cmake
     ${CMAKE_BINARY_DIR}/config.h)
@@ -324,3 +338,6 @@ endif()
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 message(STATUS "C flags: ${CMAKE_C_FLAGS}")
 message(STATUS "CXX flags: ${CMAKE_CXX_FLAGS}")
+if(JEMALLOC_FOUND)
+    message(STATUS "Using jemalloc")
+endif()

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:buster-slim as builder
+FROM debian:12.2-slim as builder
 RUN apt update && apt install -y libboost-all-dev libpq-dev libpq5 wget bison gperf libsqlite3-dev libexpat1-dev git libaspell-dev cmake libpcre3-dev nettle-dev g++ libcurl4-openssl-dev libargon2-dev libssl-dev 
 
 # Need to upgrade to a better CMAKE version, as we're super cool bleeding edge neato.
@@ -13,7 +13,7 @@ RUN ln -s /opt/cmake-3.24.0-rc4-linux-x86_64/bin/* /usr/local/bin
 RUN git clone https://github.com/jtv/libpqxx.git
 WORKDIR /opt/libpqxx
 RUN git checkout 7.6
-RUN pwd ;  cmake . && make -j2 && make install
+RUN pwd ;  cmake -DCMAKE_BUILD_TYPE=LeakCheck . && make -j2 && make install
 
 # Moving on to building toaststunt...
 WORKDIR /toaststunt
@@ -27,7 +27,7 @@ RUN pwd ;  mkdir build && cd build && cmake ../
 RUN cd /toaststunt/build && make -j2
 
 # Make an entirely new image...
-FROM debian:buster-slim 
+FROM debian:12.2-slim 
 
 # Bring over only necessary packages
 RUN apt update && apt install -y tini libpq-dev libpq5 libsqlite3-dev libexpat1-dev libaspell-dev libpcre3-dev nettle-dev libcurl4-openssl-dev libargon2-dev libssl-dev 
@@ -40,12 +40,9 @@ COPY --from=builder \
      /usr/local/lib/libpqxx* \
      /usr/local/lib/
 
-# Add Tini
-ENTRYPOINT ["/tini", "--"]
-
 # A special restart which output on stdout is needed for docker
 COPY docker_restart.sh /toaststunt/
 RUN chmod +x /toaststunt/docker_restart.sh
 EXPOSE 7777
 WORKDIR /toaststunt/
-CMD ["./docker_restart", "/cores/${CORE_TO_LOAD}"]
+ENTRYPOINT ./docker_restart.sh /cores/$CORE_TO_LOAD

docs/ChangeLog.md

@@ -10,6 +10,18 @@
 - Replaced waif counter with dictionary
 - Added tokenize_input() which takes strings written by players and tokenizes them into contextually aware verbs, macros, targets, and pronouns.
 
+## 2.7.1 (Sep 17, 2023)
+### Bug Fixes
+- Various 64-bit compatibility fixes.
+- PCRE cache no longer ignores the case sensitive option. And other improvements.
+- Fix various race conditions.
+- Fix a memory leak when LOG_CODE_CHANGES is enabled and you program a verb and then remove it.
+
+### New Features
+- Each connection now has an option to enable TCP keep-alives. These can be configured with `set_connection_option` by either specifying 1 (to enable and use defaults) or by specifying a map of options. The option keys are: idle, interval, and count. More information on what they do, and default values, can be found in options.h.
+- `listen()` now accepts a new key in its option map: interface. This allows you to specify the interface to listen on. (Similar to the --ipv4 or --ipv6 command-line arguments.)
+- `listeners()` now shows the interface being listened on.
+
 ## 2.7.0 (Mar 5, 2023)
 ### Bug Fixes
 - Fix a memory leak in `open_network_connection()` that occurred after a successful connection.

docs/README.md

@@ -107,7 +107,7 @@ make -j2
 
 ### **Gentoo**
 ```bash
-emerge app-text/aspell app-dicts/aspell-en app-crypt/argon2 cmake
+emerge app-text/aspell app-dicts/aspell-en app-crypt/argon2 dev-utils/cmake dev-libs/libpcre
 mkdir build && cd build
 cmake ../
 make -j2
@@ -146,7 +146,7 @@ There are a few build options available to developers:
 | Warn         | Optimizations enabled, warnings enabled. (Previous default behavior)         |
 | LeakCheck    | Minimal optimizations enabled, debug enabled, and address sanitizer enabled. |
 
-To change the build, use: `cmake -D CMAKE_BUILD_TYPE:STRING=BuildNameHere ../`
+To change the build, use: `cmake -DCMAKE_BUILD_TYPE=BuildNameHere ../`
 
 ### Login screen not showing
 Due to the way proxy detection works, if you're connecting to your MOO from localhost, you won't see the login screen. This is a minor inconvenience and shouldn't affect your ability to actually use your MOO. However, if it bothers you, you can disable HAProxy rewriting:

src/argon2.cc

@@ -10,7 +10,7 @@
 #include "map.h"
 #include "background.h"
 
-static void argon2_thread_callback(Var arglist, Var *r)
+static void argon2_thread_callback(Var arglist, Var *r, void *extra_data)
 {
     const int nargs = arglist.v.list[0].v.num;
 
@@ -60,20 +60,17 @@ bf_argon2(Var arglist, Byte next, void *vdata, Objid progr)
     }
 
 #ifdef THREAD_ARGON2
-    char *human_string = nullptr;
-    asprintf(&human_string, "argon2");
-
-    return background_thread(argon2_thread_callback, &arglist, human_string);
+    return background_thread(argon2_thread_callback, &arglist);
 #else
     Var ret;
-    argon2_thread_callback(arglist, &ret);
+    argon2_thread_callback(arglist, &ret, nullptr);
 
     free_var(arglist);
     return make_var_pack(ret);
 #endif
 }
 
-static void argon2_verify_thread_callback(Var arglist, Var *r)
+static void argon2_verify_thread_callback(Var arglist, Var *r, void *extra_data)
 {
     const char *encoded = arglist.v.list[1].v.str;
     const char *str = arglist.v.list[2].v.str;
@@ -98,13 +95,10 @@ bf_argon2_verify(Var arglist, Byte next, void *vdata, Objid progr)
     }
 
 #ifdef THREAD_ARGON2
-    char *human_string = nullptr;
-    asprintf(&human_string, "argon2_verify");
-
-    return background_thread(argon2_verify_thread_callback, &arglist, human_string);
+    return background_thread(argon2_verify_thread_callback, &arglist);
 #else
     Var ret;
-    argon2_verify_thread_callback(arglist, &ret);
+    argon2_verify_thread_callback(arglist, &ret, nullptr);
 
     free_var(arglist);
     return make_var_pack(ret);