Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Jun 1995 23:27:08 +0200 (MET DST)
From:      Ollivier Robert <Ollivier.Robert@keltia.frmug.fr.net>
To:        ports@FreeBSD.org (FreeBSD's ports list)
Subject:   Port for Doug Lea's malloc
Message-ID:  <199506032127.XAA14994@keltia.frmug.fr.net>

next in thread | raw e-mail | index | archive | help
Hello,

Here a shar file with my port of Doug Lea's malloc.

The Makefile  is inspired by  Mark Moraes'one for malloc-1.17. The patch-aa
is  the  same patch as posted  by  Kai Vorma <vode@snakemail.hut.fi> in the
article <199504111911.WAA08335@vinkku.hut.fi> in freebsd-hackers.

The bug in sed found by Kai Vorma with it has already been fixed.

------------------------------------------------------------
joerg       95/04/06 00:55:28

  Modified:    usr.bin/sed compile.c
  Log:
  Sed dumps core when linked with some coalescing malloc because it
  doesn't initialize malloced structure.
  
  Submitted by: vode@hut.fi
------------------------------------------------------------

Could you review it Asami please ?

Submitted-by: roberto@keltia.freenix.fr (Ollivier Robert)
Archive-name: malloc-2.5.3b/part01

#!/bin/sh
# This is malloc-2.5.3b, a shell archive (produced by GNU sharutils 4.1)
# To extract the files from this archive, save it to some FILE, remove
# everything before the `!/bin/sh' line above, then type `sh FILE'.
#
# Made on 1995-06-03 23:11 MET DST by <roberto@keltia.freenix.fr>.
# Source directory was `/users/staff/roberto/Src/C/dlmalloc'.
#
# Existing files will *not* be overwritten unless `-c' is specified.
#
# This shar contains:
# length mode       name
# ------ ---------- ------------------------------------------
#   1122 -rw-r--r-- libdlmalloc/files/Makefile
#     57 -rw-r--r-- libdlmalloc/files/md5
#    535 -rw-r--r-- libdlmalloc/Makefile
#    759 -rw-r--r-- libdlmalloc/patches/patch-aa
#     75 -rw-r--r-- libdlmalloc/pkg/PLIST
#    241 -rw-r--r-- libdlmalloc/pkg/DESCR
#     28 -rw-r--r-- libdlmalloc/pkg/COMMENT
#
touch -am 1231235999 $$.touch >/dev/null 2>&1
if test ! -f 1231235999 && test -f $$.touch; then
  shar_touch=touch
else
  shar_touch=:
  echo
  echo 'WARNING: not restoring timestamps.  Consider getting and'
  echo "installing GNU \`touch', distributed in GNU File Utilities..."
  echo
fi
rm -f 1231235999 $$.touch
#
# ============= libdlmalloc/files/Makefile ==============
if test ! -d 'libdlmalloc'; then
  echo 'x - creating directory libdlmalloc'
  mkdir 'libdlmalloc'
fi
if test ! -d 'libdlmalloc/files'; then
  echo 'x - creating directory libdlmalloc/files'
  mkdir 'libdlmalloc/files'
fi
if test -f 'libdlmalloc/files/Makefile' && test X"$1" != X"-c"; then
  echo 'x - skipping libdlmalloc/files/Makefile (file already exists)'
else
  echo 'x - extracting libdlmalloc/files/Makefile (text)'
  sed 's/^X//' << 'SHAR_EOF' > 'libdlmalloc/files/Makefile' &&
# Makefile for Doug Lea's malloc
#
# (largely based on Mark Moreas' Makefile)
#
# Renamed dlmalloc
#
#  A version of malloc/free/realloc written by Doug Lea and released to the 
#  public domain. 
#
#  preliminary VERSION 2.5.3b
#
#  working version; unreleased.
#
X
LIBDIR=${PREFIX}/lib
X
# for the shared lib stuff
VERSION=2.5
X
LIBMALLOC=libdlmalloc.a
LIBSMALLOC=libdlmalloc.so.${VERSION}
X
SRCS = malloc-2.5.3b.c
X
OBJS = malloc-2.5.3b.o
SOBJS = malloc-2.5.3b.so
X
X.SUFFIXES:
X.SUFFIXES: .out .o .po .so .s .S .c .cc .cxx .m .C .f .y .l
X
X.c.o:
X	${CC} -c ${CFLAGS} $< -o $@
X
X.c.so:
X	${CC} -c -fpic ${CFLAGS} $< -o $@
X
all: ${LIBMALLOC} ${LIBSMALLOC}
X
$(LIBMALLOC): $(OBJS)
X	rm -f $(LIBMALLOC)
X	$(AR) $(ARFLAGS) $(LIBMALLOC) $(OBJS)
X	-$(RANLIB) $(LIBMALLOC)
X
$(LIBSMALLOC): $(SOBJS)
X	rm -f $(LIBSMALLOC) 
X	ld -Bshareable -o $(LIBSMALLOC) $(SOBJS) 
X
clean:
X	-rm -f *.o \#* *~ *.core a.out gmon.out mon.out onefile.c *.sL prof.out
X
install:
X	install -c -m 644 ${LIBMALLOC} $(LIBDIR)
X	-$(RANLIB) $(LIBDIR)/${LIBMALLOC}
X	install -c -m 555 ${LIBSMALLOC} $(LIBDIR)
X
malloc-2.5.3b.o:	malloc-2.5.3b.c
malloc-2.5.3b.so:	malloc-2.5.3b.c
SHAR_EOF
  $shar_touch -am 0603230295 'libdlmalloc/files/Makefile' &&
  chmod 0644 'libdlmalloc/files/Makefile' ||
  echo 'restore of libdlmalloc/files/Makefile failed'
  shar_count="`wc -c < 'libdlmalloc/files/Makefile'`"
  test 1122 -eq "$shar_count" ||
    echo "libdlmalloc/files/Makefile: original size 1122, current size $shar_count"
fi
# ============= libdlmalloc/files/md5 ==============
if test -f 'libdlmalloc/files/md5' && test X"$1" != X"-c"; then
  echo 'x - skipping libdlmalloc/files/md5 (file already exists)'
else
  echo 'x - extracting libdlmalloc/files/md5 (text)'
  sed 's/^X//' << 'SHAR_EOF' > 'libdlmalloc/files/md5' &&
MD5 (malloc-2.5.3b.c) = 7936180a964854d052ae13ce6e1015d7
SHAR_EOF
  $shar_touch -am 0603223795 'libdlmalloc/files/md5' &&
  chmod 0644 'libdlmalloc/files/md5' ||
  echo 'restore of libdlmalloc/files/md5 failed'
  shar_count="`wc -c < 'libdlmalloc/files/md5'`"
  test 57 -eq "$shar_count" ||
    echo "libdlmalloc/files/md5: original size 57, current size $shar_count"
fi
# ============= libdlmalloc/Makefile ==============
if test -f 'libdlmalloc/Makefile' && test X"$1" != X"-c"; then
  echo 'x - skipping libdlmalloc/Makefile (file already exists)'
else
  echo 'x - extracting libdlmalloc/Makefile (text)'
  sed 's/^X//' << 'SHAR_EOF' > 'libdlmalloc/Makefile' &&
# New ports collection makefile for:	Doug Lea malloc library
# Version required:	2.5.3b
# Date created:		3 June 1995
# Whom:			roberto
#
# $Id$
#
X
DISTNAME=	dlmalloc
PKGNAME=	dlmalloc-2.5.3b
CATEGORIES+=	development programming libraries
MASTER_SITES=	gee.cs.oswego.edu:/pub/misc
DISTFILES=	malloc-2.5.3b.c
X
NO_WRKSUBDIR=   yes
NO_CONFIGURE=	yes
X
MAINTAINER=	roberto@FreeBSD.ORG
X
do-extract:
X	@rm -rf ${WRKDIR}
X	@mkdir -p ${WRKDIR}
X	cp -p ${DISTDIR}/${DISTFILES} ${WRKDIR}
X	cp -p ${FILESDIR}/Makefile ${WRKDIR}
X
X.include <bsd.port.mk>
SHAR_EOF
  $shar_touch -am 0603223995 'libdlmalloc/Makefile' &&
  chmod 0644 'libdlmalloc/Makefile' ||
  echo 'restore of libdlmalloc/Makefile failed'
  shar_count="`wc -c < 'libdlmalloc/Makefile'`"
  test 535 -eq "$shar_count" ||
    echo "libdlmalloc/Makefile: original size 535, current size $shar_count"
fi
# ============= libdlmalloc/patches/patch-aa ==============
if test ! -d 'libdlmalloc/patches'; then
  echo 'x - creating directory libdlmalloc/patches'
  mkdir 'libdlmalloc/patches'
fi
if test -f 'libdlmalloc/patches/patch-aa' && test X"$1" != X"-c"; then
  echo 'x - skipping libdlmalloc/patches/patch-aa (file already exists)'
else
  echo 'x - extracting libdlmalloc/patches/patch-aa (text)'
  sed 's/^X//' << 'SHAR_EOF' > 'libdlmalloc/patches/patch-aa' &&
*** malloc-2.5.3b.c.orig	Sun Mar 26 10:50:54 1995
--- malloc-2.5.3b.c	Fri Apr  7 19:21:29 1995
***************
*** 271,276 ****
--- 271,278 ----
X  
X  /* preliminaries */
X  
+ #include <sys/param.h>
+ 
X  #ifndef __STD_C
X  #ifdef __STDC__
X  #define	__STD_C		1
***************
*** 1365,1373 ****
X  }
X  
X  
- 
X  /* Derivatives */
X  
X  #if __STD_C
X  Void_t* valloc(size_t bytes)
X  #else
--- 1367,1375 ----
X  }
X  
X  
X  /* Derivatives */
X  
+ #if 0
X  #if __STD_C
X  Void_t* valloc(size_t bytes)
X  #else
***************
*** 1394,1400 ****
X    while (sz-- > 0) *q++ = 0;
X    return p;
X  }
! 
X  #if __STD_C
X  void cfree(Void_t *mem)
X  #else
--- 1396,1402 ----
X    while (sz-- > 0) *q++ = 0;
X    return p;
X  }
! #endif
X  #if __STD_C
X  void cfree(Void_t *mem)
X  #else
X
SHAR_EOF
  $shar_touch -am 0603223295 'libdlmalloc/patches/patch-aa' &&
  chmod 0644 'libdlmalloc/patches/patch-aa' ||
  echo 'restore of libdlmalloc/patches/patch-aa failed'
  shar_count="`wc -c < 'libdlmalloc/patches/patch-aa'`"
  test 759 -eq "$shar_count" ||
    echo "libdlmalloc/patches/patch-aa: original size 759, current size $shar_count"
fi
# ============= libdlmalloc/pkg/PLIST ==============
if test ! -d 'libdlmalloc/pkg'; then
  echo 'x - creating directory libdlmalloc/pkg'
  mkdir 'libdlmalloc/pkg'
fi
if test -f 'libdlmalloc/pkg/PLIST' && test X"$1" != X"-c"; then
  echo 'x - skipping libdlmalloc/pkg/PLIST (file already exists)'
else
  echo 'x - extracting libdlmalloc/pkg/PLIST (text)'
  sed 's/^X//' << 'SHAR_EOF' > 'libdlmalloc/pkg/PLIST' &&
@cd /usr/local
lib/libdlmalloc.a
@exec ranlib %D/%F
lib/libdlmalloc.so.2.5
SHAR_EOF
  $shar_touch -am 0603224295 'libdlmalloc/pkg/PLIST' &&
  chmod 0644 'libdlmalloc/pkg/PLIST' ||
  echo 'restore of libdlmalloc/pkg/PLIST failed'
  shar_count="`wc -c < 'libdlmalloc/pkg/PLIST'`"
  test 75 -eq "$shar_count" ||
    echo "libdlmalloc/pkg/PLIST: original size 75, current size $shar_count"
fi
# ============= libdlmalloc/pkg/DESCR ==============
if test -f 'libdlmalloc/pkg/DESCR' && test X"$1" != X"-c"; then
  echo 'x - skipping libdlmalloc/pkg/DESCR (file already exists)'
else
  echo 'x - extracting libdlmalloc/pkg/DESCR (text)'
  sed 's/^X//' << 'SHAR_EOF' > 'libdlmalloc/pkg/DESCR' &&
X  A version of malloc/free/realloc written by Doug Lea and released to the 
X  public domain. 
X
X  Version 2.5.3b
X
X  Based loosely on libg++-1.2X malloc. (It retains some of the overall 
X  structure of old version,  but most details differ.)
X
SHAR_EOF
  $shar_touch -am 0603224295 'libdlmalloc/pkg/DESCR' &&
  chmod 0644 'libdlmalloc/pkg/DESCR' ||
  echo 'restore of libdlmalloc/pkg/DESCR failed'
  shar_count="`wc -c < 'libdlmalloc/pkg/DESCR'`"
  test 241 -eq "$shar_count" ||
    echo "libdlmalloc/pkg/DESCR: original size 241, current size $shar_count"
fi
# ============= libdlmalloc/pkg/COMMENT ==============
if test -f 'libdlmalloc/pkg/COMMENT' && test X"$1" != X"-c"; then
  echo 'x - skipping libdlmalloc/pkg/COMMENT (file already exists)'
else
  echo 'x - extracting libdlmalloc/pkg/COMMENT (text)'
  sed 's/^X//' << 'SHAR_EOF' > 'libdlmalloc/pkg/COMMENT' &&
Small, fast malloc library.
SHAR_EOF
  $shar_touch -am 0603224095 'libdlmalloc/pkg/COMMENT' &&
  chmod 0644 'libdlmalloc/pkg/COMMENT' ||
  echo 'restore of libdlmalloc/pkg/COMMENT failed'
  shar_count="`wc -c < 'libdlmalloc/pkg/COMMENT'`"
  test 28 -eq "$shar_count" ||
    echo "libdlmalloc/pkg/COMMENT: original size 28, current size $shar_count"
fi
exit 0

-- 
Ollivier ROBERT    -=- The daemon is FREE! -=-    roberto@keltia.frmug.fr.net
   FreeBSD keltia 2.0-BUILT-19950602 #1: Fri Jun  2 21:01:56 MET DST 1995



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199506032127.XAA14994>