Successfully compiled met.epp with hazard pointers to cache objects

Author: AlexPeshkoff

src/jrd/Function.epp

@@ -175,7 +175,7 @@ HazardPtr<Function> Function::loadMetadata(thread_db* tdbb, USHORT id, bool nosc
 		}
 	}
 
-	Function* newFun = function.get();
+	Function* newFun = function.unsafePointer();
 	if (!newFun)
 		newFun = FB_NEW_POOL(*dbb->dbb_permanent) Function(*dbb->dbb_permanent);
 
@@ -190,7 +190,7 @@ HazardPtr<Function> Function::loadMetadata(thread_db* tdbb, USHORT id, bool nosc
 	if (!function->existenceLock)
 	{
 		Lock* const lock = FB_NEW_RPT(*attachment->att_pool, 0)
-			Lock(tdbb, sizeof(SLONG), LCK_fun_exist, function.get(), blockingAst);
+			Lock(tdbb, sizeof(SLONG), LCK_fun_exist, function.unsafePointer(), blockingAst);
 		function->existenceLock = lock;
 		lock->setKey(function->getId());
 	}
@@ -417,7 +417,7 @@ HazardPtr<Function> Function::loadMetadata(thread_db* tdbb, USHORT id, bool nosc
 						else
 							body.getBuffer(1)[0] = 0;
 
-						dbb->dbb_extManager->makeFunction(tdbb, csb, function.get(), X.RDB$ENGINE_NAME,
+						dbb->dbb_extManager->makeFunction(tdbb, csb, function.unsafePointer(), X.RDB$ENGINE_NAME,
 							(X.RDB$ENTRYPOINT.NULL ? "" : X.RDB$ENTRYPOINT), (char*) body.begin());
 
 						if (!function->fun_external)

src/jrd/HazardPtr.cpp

@@ -69,17 +69,24 @@ void RefHazardObject::addRef(thread_db*)
 	++counter;
 }
 
-HazardBase::HazardBase(thread_db* tdbb)
-	: hazardDelayed(tdbb->getAttachment()->att_delayed_delete)
-{ }
+HazardDelayedDelete* HazardBase::getHazardDelayed(thread_db* tdbb)
+{
+	if (!tdbb)
+		tdbb = JRD_get_thread_data();
+	return &tdbb->getAttachment()->att_delayed_delete;
+}
 
+HazardDelayedDelete* HazardBase::getHazardDelayed(Attachment* att)
+{
+	return &att->att_delayed_delete;
+}
 
 HazardDelayedDelete::HazardPointers* HazardDelayedDelete::HazardPointers::create(MemoryPool& p, unsigned size)
 {
 	return FB_NEW_RPT(p, size) HazardPointers(size);
 }
 
-void HazardDelayedDelete::add(void* ptr)
+void HazardDelayedDelete::add(Ptr ptr)
 {
 	// as long as we access our own hazard pointers single relaxed load is OK
 	HazardPointers *hp = hazardPointers.load(std::memory_order_relaxed);
@@ -111,7 +118,7 @@ void HazardDelayedDelete::add(void* ptr)
 	hp->hpCount++;
 }
 
-void HazardDelayedDelete::remove(void* ptr)
+void HazardDelayedDelete::remove(Ptr ptr)
 {
 	// as long as we access our own hazard pointers single relaxed load is OK
 	HazardPointers *hp = hazardPointers.load(std::memory_order_relaxed);
@@ -140,7 +147,7 @@ void HazardDelayedDelete::delayedDelete(HazardObject* mem, bool gc)
 		garbageCollect(GarbageCollectMethod::GC_NORMAL);
 }
 
-void HazardDelayedDelete::copyHazardPointers(LocalHP& local, void** from, unsigned count)
+void HazardDelayedDelete::copyHazardPointers(LocalHP& local, Ptr* from, unsigned count)
 {
 	for (unsigned n = 0; n < count; ++n)
 	{