stdlib: Add zstd module

garazdawi · Jan 20, 2025 · b83225d · b83225d
1 parent a1192b3
commit b83225d
Show file tree

Hide file tree

Showing 78 changed files with 48,494 additions and 15 deletions.
diff --git a/.github/dockerfiles/Dockerfile.ubuntu-base b/.github/dockerfiles/Dockerfile.ubuntu-base
@@ -93,7 +93,7 @@ RUN apt-get update && apt-get install -y \
     unixodbc odbc-postgresql postgresql ssh openssh-server groff-base gdb \
     tinyproxy knot ldnsutils expect vsftpd python3 emacs nano vim \
     linux-tools-common linux-tools-generic jq \
-    xvfb libgl1-mesa-dri && \
+    xvfb libgl1-mesa-dri zstd && \
     for lib in ${EXTRA_LIBS}; do apt-get install -y ${lib}; done && \
     if [ ! -f /etc/apache2/apache2.conf ]; then apt-get install -y apache2; fi
 RUN apt-get install -y linux-tools-$(uname -r) || true

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
@@ -399,6 +399,17 @@ else
 LIBS += $(OPENSSL_LIB)
 endif
 
+ZSTD_DIR = $(ERL_TOP)/erts/emulator/zstd/obj/$(TARGET)/$(TYPE)
+ZSTD_LIB = $(ZSTD_DIR)/$(LIB_PREFIX)zstd$(LIB_SUFFIX)
+DEPLIBS += $(ZSTD_LIB)
+
+ifeq ($(TARGET),win32)
+LIBS    += -L$(ZSTD_DIR) -lzstd
+else
+# Build on darwin fails if -l$(ZSTD_LIB) is used
+LIBS    += $(ZSTD_LIB)
+endif
+
 LIBSCTP = @LIBSCTP@
 
 ORG_THR_LIBS=@EMU_THR_LIBS@
@@ -442,7 +453,8 @@ CREATE_DIRS += $(OBJDIR) \
 	pcre/obj/$(TARGET)/$(TYPE) \
 	$(ZLIB_OBJDIR) \
 	$(RYU_OBJDIR) \
-	$(OPENSSL_OBJDIR)
+	$(OPENSSL_OBJDIR) \
+        $(ZSTD_OBJDIR)
 
 ifeq ($(FLAVOR),jit)
 CREATE_DIRS+=$(OBJDIR)/asmjit/ $(OBJDIR)/asmjit/core $(OBJDIR)/asmjit/$(JIT_ARCH)
@@ -513,6 +525,7 @@ include zlib/zlib.mk
 include pcre/pcre.mk
 include ryu/ryu.mk
 include openssl/openssl.mk
+include zstd/zstd.mk
 
 $(ERTS_LIB):
 	$(V_at)cd $(ERTS_LIB_DIR) && $(MAKE) $(TYPE)
@@ -812,9 +825,7 @@ COMMON_INCLUDES = -Ibeam -Isys/$(ERLANG_OSTYPE) -Isys/common -I$(TARGET)
 ifndef Z_LIB
 COMMON_INCLUDES += -Izlib 
 endif
-COMMON_INCLUDES += -Ipcre
-COMMON_INCLUDES += -Iryu
-COMMON_INCLUDES += -Iopenssl/include
+COMMON_INCLUDES += -Ipcre -Iryu -Iopenssl/include -Izstd
 COMMON_INCLUDES += -I../include -I../include/$(TARGET)
 COMMON_INCLUDES += -I../include/internal -I../include/internal/$(TARGET)
 
@@ -933,6 +944,9 @@ $(OBJDIR)/%.o: drivers/$(ERLANG_OSTYPE)/%.c
 $(OBJDIR)/%.o: nifs/common/%.c
 	$(V_CC) $(CFLAGS) -DLIBSCTP=$(LIBSCTP) $(INCLUDES) -Inifs/common -Inifs/$(ERLANG_OSTYPE) -c $< -o $@
 
+$(OBJDIR)/%.o: nifs/common/%.cpp
+	$(V_CXX) $(CFLAGS) -DLIBSCTP=$(LIBSCTP) $(INCLUDES) -Inifs/common -Inifs/$(ERLANG_OSTYPE) -c $< -o $@
+
 $(OBJDIR)/%.o: nifs/$(ERLANG_OSTYPE)/%.c
 	$(V_CC) $(CFLAGS) $(INCLUDES) -Inifs/common -Inifs/$(ERLANG_OSTYPE) -I../etc/$(ERLANG_OSTYPE) -c $< -o $@
 
@@ -1154,6 +1168,7 @@ NIF_OBJS = \
 	$(OBJDIR)/prim_buffer_nif.o \
 	$(OBJDIR)/prim_file_nif.o \
 	$(OBJDIR)/zlib_nif.o \
+	$(OBJDIR)/zstd_nif.o \
 	$(ESOCK_NIF_OBJS)
 
 ifeq ($(TARGET),win32)
@@ -1406,7 +1421,7 @@ $(TARGET)/gen_git_version.mk:
 # rebuild.
 	$(V_at)if utils/gen_git_version $@; then touch beam/erl_bif_info.c; fi
 
-DEPEND_DEPS=jit src drv nif sys target zlib ryu
+DEPEND_DEPS=jit src drv nif sys target zlib ryu zstd
 
 $(TTF_DIR)/src.depend.mk: $(TTF_DIR)/GENERATED $(PRELOAD_SRC)
 	$(gen_verbose)
@@ -1438,6 +1453,10 @@ $(TTF_DIR)/ryu.depend.mk: $(TTF_DIR)/GENERATED $(PRELOAD_SRC)
 	$(gen_verbose)
 	$(V_at)$(DEP_CC) $(DEP_FLAGS) $(RYU_SRC) > $@.tmp
 	$(V_at)$(SED_DEPEND_ZLIB) $@.tmp  > $@
+$(TTF_DIR)/zstd.depend.mk: $(TTF_DIR)/GENERATED $(PRELOAD_SRC)
+	$(gen_verbose)
+	$(V_at)$(DEP_CC) $(DEP_FLAGS) $(ZSTD_SRC) > $@.tmp
+	$(V_at)$(SED_DEPEND_ZLIB) $@.tmp  > $@
 $(TTF_DIR)/jit.depend.mk: $(TTF_DIR)/GENERATED $(PRELOAD_SRC)
 	$(gen_verbose)
 	@touch $@