[vmkit-commits] [vmkit] r85114 - in /vmkit/trunk/lib/Mvm/GCMmap2: MvmGC.h gccollector.cpp gcinit.cpp gcthread.cpp gcthread.h

[Nicolas Geoffray]

Author: geoffray
Date: Mon Oct 26 07:43:33 2009
New Revision: 85114

URL: http://llvm.org/viewvc/llvm-project?rev=85114&view=rev
Log:
Remove now unused files.


Removed:
    vmkit/trunk/lib/Mvm/GCMmap2/gcthread.cpp
    vmkit/trunk/lib/Mvm/GCMmap2/gcthread.h
Modified:
    vmkit/trunk/lib/Mvm/GCMmap2/MvmGC.h
    vmkit/trunk/lib/Mvm/GCMmap2/gccollector.cpp
    vmkit/trunk/lib/Mvm/GCMmap2/gcinit.cpp

Modified: vmkit/trunk/lib/Mvm/GCMmap2/MvmGC.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/GCMmap2/MvmGC.h?rev=85114&r1=85113&r2=85114&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/GCMmap2/MvmGC.h (original)
+++ vmkit/trunk/lib/Mvm/GCMmap2/MvmGC.h Mon Oct 26 07:43:33 2009
@@ -11,11 +11,9 @@
 #ifndef MVM_MMAP_GC_H
 #define MVM_MMAP_GC_H
 
-#include <sys/types.h>
 #include "mvm/GC/GC.h"
 #include "types.h"
 #include "gcalloc.h"
-#include "gcthread.h"
 
 #define gc_allocator std::allocator
 #define gc_new(Class)  __gc_new(Class::VT) Class
@@ -34,7 +32,7 @@
   friend class GCThread;
   friend class CollectionRV;
   static GCAllocator  *allocator;      /* The allocator */
-
+  static SpinLock _globalLock;         /* Global lock for allocation */  
 
   static GCChunkNode  *used_nodes;     /* Used memory nodes */
   static GCChunkNode  *unused_nodes;   /* Unused memory nodes */
@@ -51,8 +49,8 @@
   
   enum { stat_collect, stat_alloc, stat_broken };
 
-  static inline void  lock()   { threads->lock(); }
-  static inline void  unlock() { threads->unlock(); }
+  static inline void  lock()   { _globalLock.lock(); }
+  static inline void  unlock() { _globalLock.unlock(); }
   
   /* Interface for collection, verifies enable_collect */
   static void collect_unprotect();    
@@ -70,7 +68,6 @@
   
 
 public:
-  static GCThread *threads; 
   static void (*internMemoryError)(unsigned int);
   
   static bool isLive(void* ptr) {

Modified: vmkit/trunk/lib/Mvm/GCMmap2/gccollector.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/GCMmap2/gccollector.cpp?rev=85114&r1=85113&r2=85114&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/GCMmap2/gccollector.cpp (original)
+++ vmkit/trunk/lib/Mvm/GCMmap2/gccollector.cpp Mon Oct 26 07:43:33 2009
@@ -12,8 +12,7 @@
 using namespace mvm;
 
 GCAllocator   *Collector::allocator = 0;
-GCThread      *Collector::threads;
-
+SpinLock      Collector::_globalLock;
 
 int           Collector::status;
 

Modified: vmkit/trunk/lib/Mvm/GCMmap2/gcinit.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/GCMmap2/gcinit.cpp?rev=85114&r1=85113&r2=85114&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/GCMmap2/gcinit.cpp (original)
+++ vmkit/trunk/lib/Mvm/GCMmap2/gcinit.cpp Mon Oct 26 07:43:33 2009
@@ -19,7 +19,6 @@
  
   used_nodes = new GCChunkNode();
   unused_nodes = new GCChunkNode();
-  threads = new GCThread(); 
   allocator = new GCAllocator();
    
   used_nodes->alone();

Removed: vmkit/trunk/lib/Mvm/GCMmap2/gcthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/GCMmap2/gcthread.cpp?rev=85113&view=auto

==============================================================================
--- vmkit/trunk/lib/Mvm/GCMmap2/gcthread.cpp (original)
+++ vmkit/trunk/lib/Mvm/GCMmap2/gcthread.cpp (removed)
@@ -1,13 +0,0 @@
-//===-------------- gcthread.cc - Mvm Garbage Collector -------------------===//
-//
-//                              Mvm
-//
-// This file is distributed under the University of Illinois Open Source 
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include <cassert>
-#include "MvmGC.h"
-
-using namespace mvm;

Removed: vmkit/trunk/lib/Mvm/GCMmap2/gcthread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/GCMmap2/gcthread.h?rev=85113&view=auto

==============================================================================
--- vmkit/trunk/lib/Mvm/GCMmap2/gcthread.h (original)
+++ vmkit/trunk/lib/Mvm/GCMmap2/gcthread.h (removed)
@@ -1,34 +0,0 @@
-//===--------------- gcthread.h - Mvm Garbage Collector -------------------===//
-//
-//                              Mvm
-//
-// This file is distributed under the University of Illinois Open Source 
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _GC_THREAD_H_
-#define _GC_THREAD_H_
-
-#include "mvm/Threads/Cond.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/Threads/Thread.h"
-
-namespace mvm {
-
-class GCThread {
-  /// _globalLock - Global lock for gcmalloc.
-  SpinLock _globalLock;
-
-  
-public:
-
-  GCThread() {}
-  
-  void lock()   { _globalLock.lock(); }
-  void unlock() { _globalLock.unlock(); }
-
-};
-
-}
-#endif