WIP

Author: AlexPeshkoff

src/dsql/DdlNodes.epp

@@ -49,7 +49,7 @@
 #include "../jrd/exe_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../common/isc_f_proto.h"
-#include "../jrd/lck_proto.h"
+#include "../jrd/lck.h"
 #include "../jrd/met_proto.h"
 #include "../jrd/scl_proto.h"
 #include "../jrd/vio_proto.h"

src/include/fb_exception.h

@@ -102,9 +102,9 @@ class status_exception : public Exception
 
 	const ISC_STATUS* value() const throw() { return m_status_vector; }
 
-	[[noreturn]] static void raise [[noreturn]] (const ISC_STATUS* status_vector);
-	[[noreturn]] static void raise [[noreturn]] (const Arg::StatusVector& statusVector);
-	[[noreturn]] static void raise [[noreturn]] (const IStatus* status);
+	static void raise [[noreturn]] (const ISC_STATUS* status_vector);
+	static void raise [[noreturn]] (const Arg::StatusVector& statusVector);
+	static void raise [[noreturn]] (const IStatus* status);
 
 protected:
 	// Create exception with undefined status vector, this constructor allows

src/jrd/Collation.cpp

@@ -97,7 +97,7 @@
 #include "../jrd/err_proto.h"
 #include "../jrd/evl_string.h"
 #include "../jrd/intl_classes.h"
-#include "../jrd/lck_proto.h"
+#include "../jrd/lck.h"
 #include "../jrd/intl_classes.h"
 #include "../jrd/intl_proto.h"
 #include "../jrd/Collation.h"

src/jrd/CryptoManager.cpp

@@ -41,7 +41,7 @@
 #include "../jrd/pag.h"
 #include "../jrd/nbak.h"
 #include "../jrd/cch_proto.h"
-#include "../jrd/lck_proto.h"
+#include "../jrd/lck.h"
 #include "../jrd/pag_proto.h"
 #include "firebird/impl/inf_pub.h"
 #include "../jrd/Monitoring.h"

src/jrd/Database.cpp

@@ -36,7 +36,7 @@
 #include "../jrd/met_proto.h"
 #include "../jrd/pag_proto.h"
 #include "../jrd/tpc_proto.h"
-#include "../jrd/lck_proto.h"
+#include "../jrd/lck.h"
 #include "../jrd/CryptoManager.h"
 #include "../jrd/os/pio_proto.h"
 #include "../common/os/os_utils.h"

src/jrd/Function.epp

@@ -39,7 +39,7 @@
 #include "../jrd/exe_proto.h"
 #include "../jrd/flu_proto.h"
 #include "../jrd/fun_proto.h"
-#include "../jrd/lck_proto.h"
+#include "../jrd/lck.h"
 #include "../jrd/met_proto.h"
 #include "../jrd/mov_proto.h"
 #include "../jrd/par_proto.h"

src/jrd/GlobalRWLock.cpp

@@ -33,7 +33,7 @@
 #include "../lock/lock_proto.h"
 #include "../common/isc_proto.h"
 #include "jrd.h"
-#include "lck_proto.h"
+#include "lck.h"
 #include "err_proto.h"
 #include "Attachment.h"
 #include "../common/classes/rwlock.h"

src/jrd/GlobalRWLock.h

@@ -33,7 +33,7 @@
 #include "../common/classes/alloc.h"
 #include "../jrd/jrd.h"
 #include "../jrd/lck.h"
-#include "../jrd/lck_proto.h"
+#include "../jrd/lck.h"
 #include "fb_types.h"
 #include "os/pio.h"
 #include "../common/classes/condition.h"

src/jrd/HazardPtr.cpp

@@ -197,3 +197,7 @@ void CacheObject::afterUnlock(thread_db* tdbb)
 	// do nothing
 }
 
+void CacheObject::lockedExcl [[noreturn]] (thread_db* tdbb)
+{
+	fatal_exception::raise("Unspecified object locked exclusive for deletion");
+}

src/jrd/HazardPtr.h

@@ -683,6 +683,7 @@ namespace Jrd {
 	public:
 		virtual bool checkObject(thread_db* tdbb, Firebird::Arg::StatusVector&);
 		virtual void afterUnlock(thread_db* tdbb);
+		virtual void lockedExcl [[noreturn]] (thread_db* tdbb);
 	};
 
 } // namespace Jrd