remove unused vmtrbusy API

diff --git a/lib/vmalloc/CMakeLists.txt b/lib/vmalloc/CMakeLists.txt
index 729f02522fa34c6ff5618bfd60db19f31aaa0b0d..e41410c1dc3ee3a676828ac212eb83a032ec43ae 100644 (file)
--- a/lib/vmalloc/CMakeLists.txt
+++ b/lib/vmalloc/CMakeLists.txt
@@ -16,6 +16,5 @@ add_library(vmalloc STATIC
     vmset.c
     vmstat.c
     vmstrdup.c
-    vmtrace.c
     vmwalk.c
 )

diff --git a/lib/vmalloc/Makefile.am b/lib/vmalloc/Makefile.am
index 4f6c0ecdf2131f6236cee077b2ea6f2e71525dd3..50df9ea1a7c02f873db654b8b8afab47140ea082 100644 (file)
--- a/lib/vmalloc/Makefile.am
+++ b/lib/vmalloc/Makefile.am
@@ -7,6 +7,6 @@ noinst_LTLIBRARIES = libvmalloc_C.la
 libvmalloc_C_la_SOURCES = vmbest.c vmclear.c vmclose.c vmdcheap.c \
        vmopen.c vmprivate.c \
        vmregion.c vmset.c vmstat.c vmstrdup.c \
-       vmtrace.c vmwalk.c
+       vmwalk.c
 
 EXTRA_DIST = README vmalloc.vcxproj*

diff --git a/lib/vmalloc/vmalloc.h b/lib/vmalloc/vmalloc.h
index ac90d529b7cb452b85229538e40b7b50d75fb009..385a9c3fd879a87297015e99ee8d9d795acb4ac0 100644 (file)
--- a/lib/vmalloc/vmalloc.h
+++ b/lib/vmalloc/vmalloc.h
@@ -125,8 +125,6 @@ extern "C" {
 
     extern int vmprofile(Vmalloc_t *, int);
 
-    extern int vmtrbusy(Vmalloc_t *);
-
     extern int vmstat(Vmalloc_t *, Vmstat_t *);
 
     extern int vmwalk(Vmalloc_t *,

diff --git a/lib/vmalloc/vmalloc.vcxproj b/lib/vmalloc/vmalloc.vcxproj
index edcf5376054e520b25d430fb9c7a23db97c592ef..43a95fe9da2b7e19927823d7ea9552940b48e345 100644 (file)
--- a/lib/vmalloc/vmalloc.vcxproj
+++ b/lib/vmalloc/vmalloc.vcxproj
@@ -106,7 +106,6 @@
     <ClCompile Include="vmset.c" />
     <ClCompile Include="vmstat.c" />
     <ClCompile Include="vmstrdup.c" />
-    <ClCompile Include="vmtrace.c" />
     <ClCompile Include="vmwalk.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/lib/vmalloc/vmalloc.vcxproj.filters b/lib/vmalloc/vmalloc.vcxproj.filters
index bbddaa27c26a19d5b9552b04cf782cf7a4e0a8e3..93fb0ec7627176e6b96a2e90ea0e4134ca4d024a 100644 (file)
--- a/lib/vmalloc/vmalloc.vcxproj.filters
+++ b/lib/vmalloc/vmalloc.vcxproj.filters
@@ -53,9 +53,6 @@
     <ClCompile Include="vmstrdup.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vmtrace.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="vmwalk.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/lib/vmalloc/vmtrace.c b/lib/vmalloc/vmtrace.c
deleted file mode 100644 (file)
index 6f3a4b7..0000000
--- a/lib/vmalloc/vmtrace.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/*************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************/
-
-#include       "vmhdr.h"
-
-/*     Turn on tracing for regions
-**
-**     Written by Kiem-Phong Vo, kpv@research.att.com, 01/16/94.
-*/
-
-static int Trfile = -1;
-static char Trbuf[128];
-
-static char *trstrcpy(char *to, char *from, int endc)
-{
-    reg int n;
-
-    n = strlen(from);
-    memcpy(to, from, n);
-    to += n;
-    if ((*to = endc))
-       to += 1;
-    return to;
-}
-
-/*
- * convert a long value to an ascii representation
- *
- * @param v value to convert
- * @param type =0 base-16, >0: unsigned base-10, <0: signed base-10
- */
-static char *tritoa(Vmulong_t v, int type)
-{
-    char *s;
-
-    s = &Trbuf[sizeof(Trbuf) - 1];
-    *s-- = '\0';
-
-    if (type == 0) {           /* base-16 */
-       reg char *digit = "0123456789abcdef";
-       do {
-           *s-- = digit[v & 0xf];
-           v >>= 4;
-       } while (v);
-       *s-- = 'x';
-       *s-- = '0';
-    } else if (type > 0) {     /* unsigned base-10 */
-       do {
-           *s-- = (char) ('0' + (v % 10));
-           v /= 10;
-       } while (v);
-    } else {                   /* signed base-10 */
-       int sign = ((long) v < 0);
-       if (sign)
-           v = (Vmulong_t) (-((long) v));
-       do {
-           *s-- = (char) ('0' + (v % 10));
-           v /= 10;
-       } while (v);
-       if (sign)
-           *s-- = '-';
-    }
-
-    return s + 1;
-}
-
-/**
- * generate a trace of some call
- * @param vm region call was made from
- * @param newaddr old data address
- * @param newaddr new data address
- * @param size size of piece
- * @param align alignment
- */
-static void trtrace(Vmalloc_t * vm,
-                   Vmuchar_t * oldaddr, Vmuchar_t * newaddr, size_t size,
-                   size_t align)
-{
-    char buf[1024], *bufp, *endbuf;
-    reg Vmdata_t *vd = vm->data;
-    reg char *file = NIL(char *);
-    reg int line = 0;
-    int type;
-#define SLOP   32
-
-    if (oldaddr == (Vmuchar_t *) (-1)) {       /* printing busy blocks */
-       type = 0;
-       oldaddr = NIL(Vmuchar_t *);
-    } else {
-       type = vd->mode & VM_METHODS;
-       VMFILELINE(vm, file, line);
-    }
-
-    if (Trfile < 0)
-       return;
-
-    bufp = buf;
-    endbuf = buf + sizeof(buf);
-    bufp = trstrcpy(bufp, tritoa(oldaddr ? VLONG(oldaddr) : 0L, 0), ':');
-    bufp = trstrcpy(bufp, tritoa(newaddr ? VLONG(newaddr) : 0L, 0), ':');
-    bufp = trstrcpy(bufp, tritoa((Vmulong_t) size, 1), ':');
-    bufp = trstrcpy(bufp, tritoa((Vmulong_t) align, 1), ':');
-    bufp = trstrcpy(bufp, tritoa(VLONG(vm), 0), ':');
-    if (type & VM_MTBEST)
-       bufp = trstrcpy(bufp, "best", ':');
-    else if (type & VM_MTLAST)
-       bufp = trstrcpy(bufp, "last", ':');
-    else if (type & VM_MTPOOL)
-       bufp = trstrcpy(bufp, "pool", ':');
-    else if (type & VM_MTPROFILE)
-       bufp = trstrcpy(bufp, "profile", ':');
-    else if (type & VM_MTDEBUG)
-       bufp = trstrcpy(bufp, "debug", ':');
-    else
-       bufp = trstrcpy(bufp, "busy", ':');
-    if (file && file[0] && line > 0
-       && (bufp + strlen(file) + SLOP) < endbuf) {
-       bufp = trstrcpy(bufp, file, ',');
-       bufp = trstrcpy(bufp, tritoa((Vmulong_t) line, 1), ':');
-    }
-    *bufp++ = '\n';
-    *bufp = '\0';
-
-    write(Trfile, buf, (bufp - buf));
-}
-
-int vmtrbusy(Vmalloc_t * vm)
-{
-    Seg_t *seg;
-    Vmdata_t *vd = vm->data;
-
-    if (Trfile < 0
-       || !(vd->mode & (VM_MTBEST | VM_MTDEBUG | VM_MTPROFILE)))
-       return -1;
-
-    for (seg = vd->seg; seg; seg = seg->next) {
-       Block_t *b, *endb;
-       Vmuchar_t *data;
-       size_t s;
-
-       for (b = SEGBLOCK(seg), endb = BLOCK(seg->baddr); b < endb;) {
-           if (ISJUNK(SIZE(b)) || !ISBUSY(SIZE(b)))
-               continue;
-
-           data = DATA(b);
-           if (vd->mode & VM_MTDEBUG) {
-               data = DB2DEBUG(data);
-               s = DBSIZE(data);
-           } else if (vd->mode & VM_MTPROFILE)
-               s = PFSIZE(data);
-           else
-               s = SIZE(b) & ~BITS;
-
-           trtrace(vm, (Vmuchar_t *) (-1), data, s, 0);
-
-           b = (Block_t *) ((Vmuchar_t *) DATA(b) + (SIZE(b) & ~BITS));
-       }
-    }
-
-    return 0;
-}