Skip to content

Commit

Permalink
Merge pull request #5189 from gza060625/isTimeForGlobalGCKickoff
Browse files Browse the repository at this point in the history
  • Loading branch information
youngar authored May 13, 2020
2 parents 92e2fea + 934f5f1 commit 39e295b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 13 deletions.
7 changes: 0 additions & 7 deletions gc/base/Collector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -538,13 +538,6 @@ MM_Collector::setThreadFailAllocFlag(MM_EnvironmentBase* env, bool flag)
}
}

bool
MM_Collector::isTimeForGlobalGCKickoff()
{
Assert_MM_unreachable();
return false;
}

/**
* Abort any currently active garbage collection activity.
* The abort consists of halting any activity related to garbage collection, and resetting/releasing said
Expand Down
6 changes: 0 additions & 6 deletions gc/base/Collector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@ class MM_Collector : public MM_BaseVirtual
uint64_t _masterThreadCpuTimeStart; /**< slot to store the master CPU time at the beginning of the collection */

public:
/*
* Determine if a collector (some parent, typically the global collector) wishes to usurp any minor collection.
* @return boolean indicating if the parent collector should be invoked in place of a child.
*/
virtual bool isTimeForGlobalGCKickoff();

/**
* Perform any collector-specific initialization.
* @return TRUE if startup completes OK, FALSE otherwise
Expand Down
5 changes: 5 additions & 0 deletions gc/base/GlobalCollector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ class MM_GlobalCollector : public MM_Collector {
public:
MM_GlobalCollectorDelegate *getGlobalCollectorDelegate() { return &_delegate; }


/*
* Determine if a collector (some parent, typically the global collector) wishes to usurp any minor collection.
* @return boolean indicating if the parent collector should be invoked in place of a child.
*/
virtual bool isTimeForGlobalGCKickoff();

virtual bool condYield(MM_EnvironmentBase *env, uint64_t timeSlackNanoSec)
Expand Down

0 comments on commit 39e295b

Please sign in to comment.