YAJL to Jansson

Signed-off-by: Sourav Moitra <[email protected]>

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     - run: |
        sudo apt-get update
-       sudo apt-get install -y make git gcc build-essential pkgconf libtool libsystemd-dev libcap-dev libseccomp-dev libyajl-dev go-md2man libtool autoconf python3 automake libprotobuf-c-dev
+       sudo apt-get install -y make git gcc build-essential pkgconf libtool libsystemd-dev libcap-dev libseccomp-dev libjansson-dev go-md2man libtool autoconf python3 automake libprotobuf-c-dev
        ./autogen.sh
        ./configure
        make -j $(nproc)

.github/workflows/release.yaml

@@ -19,7 +19,7 @@ jobs:
 
       - run: sudo apt-get update
 
-      - run: sudo apt-get install -y make git gcc build-essential pkgconf libtool libsystemd-dev libcap-dev libseccomp-dev libyajl-dev go-md2man libtool autoconf python3 automake libprotobuf-c-dev
+      - run: sudo apt-get install -y make git gcc libc6-dev build-essential pkgconf libtool libsystemd-dev libcap-dev libseccomp-dev libjansson-dev go-md2man libtool autoconf python3 automake libprotobuf-c-dev
 
       - run: |
           set -ex

.github/workflows/test.yaml

@@ -37,7 +37,7 @@ jobs:
 
           install: |
             apt-get update -q -y
-            apt-get install -q -y automake libtool autotools-dev libseccomp-dev git make libcap-dev cmake pkg-config gcc wget go-md2man libsystemd-dev gperf clang-format libyajl-dev libprotobuf-c-dev
+            apt-get install -q -y automake libtool autotools-dev libseccomp-dev git make libcap-dev cmake pkg-config gcc wget go-md2man libsystemd-dev gperf clang-format libjansson-dev libprotobuf-c-dev
 
           run: |
             find $(pwd) -name '.git' -exec bash -c 'git config --global --add safe.directory ${0%/.git}' {} \;
@@ -91,7 +91,7 @@ jobs:
 
           sudo add-apt-repository -y ppa:criu/ppa
           # add-apt-repository runs apt-get update so we don't have to.
-          sudo apt-get install -q -y criu automake libtool autotools-dev libseccomp-dev git make libcap-dev cmake pkg-config gcc wget go-md2man libsystemd-dev gperf clang-format libyajl-dev containerd runc libasan6 libprotobuf-c-dev
+          sudo apt-get install -q -y criu automake libtool autotools-dev libseccomp-dev git make libcap-dev cmake pkg-config gcc wget go-md2man libsystemd-dev gperf clang-format libjansson-dev containerd runc libasan6 libprotobuf-c-dev
 
       - name: run autogen.sh
         run: |
@@ -203,7 +203,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get update -q -y
-          sudo apt-get install -q -y automake libtool autotools-dev libseccomp-dev git make libcap-dev cmake pkg-config gcc wget go-md2man libsystemd-dev gperf clang-format libyajl-dev libprotobuf-c-dev
+          sudo apt-get install -q -y automake libtool autotools-dev libseccomp-dev git make libcap-dev cmake pkg-config gcc wget go-md2man libsystemd-dev gperf clang-format libjansson-dev libprotobuf-c-dev
       - uses: lumaxis/shellcheck-problem-matchers@v2
       - name: shellcheck
         run: |

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "libocispec"]
 	path = libocispec
-	url = https://github.com/containers/libocispec.git
+	url = https://github.com/xw19/libocispec.git
+	branch = switch-to-jansson

Makefile.am

@@ -70,12 +70,6 @@ libcrun_SOURCES = src/libcrun/utils.c \
 		src/libcrun/status.c \
 		src/libcrun/terminal.c
 
-if HAVE_EMBEDDED_YAJL
-maybe_libyajl.la = libocispec/yajl/libyajl.la
-else
-maybe_libyajl.la =
-endif
-
 libocispec/libocispec.la:
 	$(MAKE) $(AM_MAKEFLAGS) -C libocispec libocispec.la
 

build-aux/release.sh

@@ -46,13 +46,19 @@ mkdir -p /nix
 NIX_ARGS="--extra-experimental-features nix-command --print-build-logs --option cores $(nproc) --option max-jobs $(nproc)"
 
 for ARCH in amd64 arm64 ppc64le riscv64 s390x; do
-    $RUNTIME run --init --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \
+    $RUNTIME run --init --rm $RUNTIME_EXTRA_ARGS --privileged \
+        -v /nix:/nix \
+        -v ${PWD}:${PWD} \
+        -w ${PWD} ${NIX_IMAGE} \
         nix $NIX_ARGS build --max-jobs auto --file nix/default-${ARCH}.nix
     cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-${ARCH}
 
     rm -rf result
 
-    $RUNTIME run --init --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \
+    $RUNTIME run --init --rm $RUNTIME_EXTRA_ARGS --privileged \
+        -v /nix:/nix \
+        -v ${PWD}:${PWD} \
+        -w ${PWD} ${NIX_IMAGE} \
         nix $NIX_ARGS build --max-jobs auto --file nix/default-${ARCH}.nix --arg enableSystemd false
     cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-${ARCH}-disable-systemd
 

configure.ac

@@ -55,15 +55,7 @@ esac
 [enable_libcrun=true])
 AM_CONDITIONAL([ENABLE_LIBCRUN], [test "x${enable_libcrun}" = xtrue])
 
-dnl embedded yajl
-AC_ARG_ENABLE(embedded-yajl,
-AS_HELP_STRING([--enable-embedded-yajl], [Statically link a modified yajl version]),
-[
-case "${enableval}" in
-	yes) embedded_yajl=true ;;
-	no)  embedded_yajl=false ;;
-	*) AC_MSG_ERROR(bad value ${enableval} for --enable-embedded-yajl) ;;
-esac],[embedded_yajl=false])
+AC_SEARCH_LIBS(json_object, [jansson], [AC_DEFINE([HAVE_JANSSON], 1, [Define if libjansson is available])], [AC_MSG_ERROR([*** libjansson headers not found])])
 
 AC_ARG_ENABLE(dynload-libcrun,
 AS_HELP_STRING([--enable-dynload-libcrun], [Dynamically load libcrun]),
@@ -75,12 +67,6 @@ case "${enableval}" in
 esac],[dynload_libcrun=false])
 AM_CONDITIONAL([DYNLOAD_LIBCRUN], [test x"$dynload_libcrun" = xtrue])
 
-AM_CONDITIONAL([HAVE_EMBEDDED_YAJL], [test x"$embedded_yajl" = xtrue])
-AM_COND_IF([HAVE_EMBEDDED_YAJL], [], [
-AC_SEARCH_LIBS(yajl_tree_get, [yajl], [AC_DEFINE([HAVE_YAJL], 1, [Define if libyajl is available])], [AC_MSG_ERROR([*** libyajl headers not found])])
-PKG_CHECK_MODULES([YAJL], [yajl >= 2.0.0])
-])
-
 dnl libcap
 AC_ARG_ENABLE([caps],
 	AS_HELP_STRING([--disable-caps], [Ignore libcap and disable support]))

lua/lua_crun.c

@@ -658,20 +658,20 @@ luacrun_ctx_update_container (lua_State *S)
   const char *content = luaL_checkstring (S, 3);
   luaL_checkstack (S, 2, NULL);
 
-  char errbuf[1024] = {};
-  yajl_val parsed_json = yajl_tree_parse (content, errbuf, sizeof (errbuf));
+  json_error_t *error;
+  json_t *parsed_json = json_loads (content, 0, error);
   if (parsed_json == NULL)
     {
       lua_pushboolean (S, false);
-      lua_pushfstring (S, "cannot parse the data: \"%s\"", errbuf);
+      lua_pushfstring (S, "cannot parse the data: \"%s\"", error->text);
       return 2;
     }
 
   struct parser_context parser_ctx = { .options = 0, .errfile = stderr };
   runtime_spec_schema_config_schema_process *rt_spec_process;
   parser_error p_err = NULL;
   rt_spec_process = make_runtime_spec_schema_config_schema_process (parsed_json, &parser_ctx, &p_err);
-  yajl_tree_free (parsed_json);
+  json_decref (parsed_json);
   if (rt_spec_process == NULL)
     {
       lua_pushboolean (S, false);

nix/derivation.nix

@@ -18,6 +18,8 @@ with pkgs; stdenv.mkDerivation {
     pkg-config
     python3
     which
+    gcc
+    boost
   ];
   buildInputs =
     (if stdenv.hostPlatform.isMusl then [
@@ -29,15 +31,15 @@ with pkgs; stdenv.mkDerivation {
       libcap
       libseccomp
       libsystemd
-      yajl
+      jansson
     ] ++ lib.optionals enableCriu [ criu ];
   configureFlags = [ "--enable-static" ] ++ lib.optional (!enableSystemd) [ "--disable-systemd" ];
   prePatch = ''
     export CFLAGS='-static -pthread'
     export LDFLAGS='-s -w -static-libgcc -static'
     export EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"'
     export CRUN_LDFLAGS='-all-static'
-    export LIBS='${lib.optionalString enableCriu "${criu}/lib/libcriu.a"} ${if stdenv.hostPlatform.isMusl then "${musl}/lib/libc.a ${musl}/lib/libpthread.a ${musl}/lib/librt.a" else "${glibc.static}/lib/libc.a ${glibc.static}/lib/libpthread.a ${glibc.static}/lib/librt.a"} ${lib.getLib libcap}/lib/libcap.a ${lib.getLib libseccomp}/lib/libseccomp.a ${lib.optionalString enableSystemd "${lib.getLib libsystemd}/lib/libsystemd.a"} ${yajl}/lib/libyajl.a'
+    export LIBS='${lib.optionalString enableCriu "${criu}/lib/libcriu.a"} ${if stdenv.hostPlatform.isMusl then "${musl}/lib/libc.a ${musl}/lib/libpthread.a ${musl}/lib/librt.a" else "${glibc.static}/lib/libc.a ${glibc.static}/lib/libpthread.a ${glibc.static}/lib/librt.a"} ${lib.getLib libcap}/lib/libcap.a ${lib.getLib libseccomp}/lib/libseccomp.a ${lib.optionalString enableSystemd "${lib.getLib libsystemd}/lib/libsystemd.a"} ${jansson}/lib/libjansson.a'
   '';
   buildPhase = ''
     patchShebangs .

nix/overlay.nix

@@ -30,11 +30,6 @@ self: super:
       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow"
     '';
   });
-  yajl = super.yajl.overrideAttrs (x: {
-    cmakeFlags = (x.cmakeFlags or [ ]) ++ [
-      "-DBUILD_SHARED_LIBS=OFF"
-    ];
-  });
   zstd = super.zstd.overrideAttrs (x: {
     cmakeFlags = x.cmakeFlags ++ [ "-DZSTD_BUILD_CONTRIB:BOOL=OFF" ];
     preInstall = "";

python/crun_python.c

@@ -359,15 +359,15 @@ container_status (PyObject *self arg_unused, PyObject *args)
 }
 
 static int
-load_json_file (yajl_val *out, const char *jsondata, struct parser_context *ctx arg_unused, libcrun_error_t *err)
+load_json_file (json_t *out, const char *jsondata, struct parser_context *ctx arg_unused, libcrun_error_t *err)
 {
-    char errbuf[1024];
+    json_error_t *error;
 
     *err = NULL;
 
-    *out = yajl_tree_parse (jsondata, errbuf, sizeof (errbuf));
+    *out = json_loads (jsondata, 0, error);
     if (*out == NULL)
-      return libcrun_make_error (err, 0, "cannot parse the data: `%s`", errbuf);
+      return libcrun_make_error (err, 0, "cannot parse the data: `%s`", error->text);
 
     return 0;
 }
@@ -380,7 +380,7 @@ container_update (PyObject *self arg_unused, PyObject *args)
   libcrun_context_t *ctx;
   char *id = NULL;
   char *content = NULL;
-  yajl_val tree = NULL;
+  json_t *tree = NULL;
   int ret;
   parser_error parser_err = NULL;
   struct parser_context parser_ctx = { 0, stderr };
@@ -393,12 +393,12 @@ container_update (PyObject *self arg_unused, PyObject *args)
   if (ctx == NULL)
     return NULL;
 
-  ret = load_json_file (&tree, content, &parser_ctx, &err);
+  ret = load_json_file (tree, content, &parser_ctx, &err);
   if (UNLIKELY (ret < 0))
     return set_error (&err);
 
   process = make_runtime_spec_schema_config_schema_process (tree, &parser_ctx, &parser_err);
-  yajl_tree_free (tree);
+  json_decref (tree);
   if (process == NULL)
     {
       cleanup_free char *msg = NULL;

rpm/crun.spec

@@ -62,9 +62,7 @@ BuildRequires: libcap-devel
 BuildRequires: libkrun-devel
 %endif
 BuildRequires: systemd-devel
-%if %{defined system_yajl}
-BuildRequires: yajl-devel
-%endif
+BuildRequires: jansson-devel
 BuildRequires: libseccomp-devel
 BuildRequires: python3-libmount
 BuildRequires: libtool

src/create.c

@@ -161,8 +161,6 @@ crun_command_create (struct crun_global_arguments *global_args, int argc, char *
   container = libcrun_container_load_from_file (config_file, err);
   if (container == NULL)
     libcrun_fail_with_error (0, "error loading config.json");
-
-  libcrun_debug ("Using bundle: %s", bundle);
   crun_context.bundle = bundle;
   if (getenv ("LISTEN_FDS"))
     {

src/crun.c

@@ -264,7 +264,7 @@ print_version (FILE *stream, struct argp_state *state arg_unused)
 
   libcrun_handler_manager_print_feature_tags (libcrun_get_handler_manager (), stream);
 
-  fprintf (stream, "+YAJL\n");
+  fprintf (stream, "+JANSSON\n");
 }
 
 static error_t