Hide DeeThreadObject.t_deepassoc under CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR

Author: GrieferAtWork

include/deemon/thread.h

@@ -140,6 +140,7 @@ struct Dee_trepr_frame {
 	DeeTypeObject          *rf_type; /* [1..1][const] The type of object that is being converted to a string. */
 };
 
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 struct Dee_deep_assoc_entry {
 	DREF DeeObject *de_old; /* [0..1] The old object that is being copied.
 	                         * NOTE: NULL is used to indicate a sentinel entry.
@@ -214,6 +215,7 @@ struct Dee_deep_assoc {
 DFUNDEF WUNUSED NONNULL((1, 2)) DeeObject *DCALL
 Dee_DeepCopyAddAssoc(DeeObject *new_object,
                      DeeObject *old_object);
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 
 
 #ifdef CONFIG_BUILDING_DEEMON
@@ -351,9 +353,11 @@ typedef struct Dee_thread_object {
 	struct Dee_repr_frame         *t_hash_curr;  /* [lock(PRIVATE(DeeThread_Self()))][0..1]
 	                                              * [valid_if(Dee_THREAD_STATE_STARTED && !Dee_THREAD_STATE_TERMINATED)]
 	                                              * Chain of GC objects currently invoking the `__hash__' operator. */
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 	struct Dee_deep_assoc          t_deepassoc;  /* [lock(PRIVATE(DeeThread_Self()))]
 	                                              * [valid_if(Dee_THREAD_STATE_STARTED && !Dee_THREAD_STATE_TERMINATED)]
 	                                              * Deepcopy association map. */
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 	struct Dee_code_frame         *t_exec;       /* [lock(PRIVATE(DeeThread_Self()))][0..1][(!= NULL) == (t_execsz != 0)]
 	                                              * [if(!Dee_THREAD_STATE_STARTED || Dee_THREAD_STATE_TERMINATED, [0..0])]
 	                                              * [const_if(Dee_THREAD_STATE_TERMINATED)]
@@ -734,7 +738,7 @@ DeeThread_RemoveInterruptHook(struct Dee_thread_interrupt_hook *__restrict hook)
 
 
 /* The max stack-depth during execution before a stack-overflow is raised. */
-DDATDEF uint16_t DeeExec_StackLimit;
+DDATDEF uint16_t DeeExec_StackLimit; /* TODO: Change this to uint32_t (we want to allow the user to set stack limits > 2**16, plus 32-bit arithmetic is probably faster than 16-bit!) */
 
 #ifndef Dee_EXEC_DEFAULT_STACK_LIMIT
 #define Dee_EXEC_DEFAULT_STACK_LIMIT 1024

src/deemon/execute/asm/exec.gas-386.S

@@ -413,11 +413,15 @@ END(_impl_assert_failed)
 #endif /* !CONFIG_EXPERIMENTAL_MODULE_DIRECTORIES */
 #define t_repr_curr    (t_str_curr+4)               /* struct Dee_repr_frame *t_repr_curr; */
 #define t_hash_curr    (t_str_curr+8)               /* struct Dee_repr_frame *t_hash_curr; */
+#ifdef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
+#define t_exec         (t_str_curr+12)              /* struct Dee_code_frame *t_exec; */
+#else /* CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 #define t_deepassoc    (t_str_curr+12)              /* struct Dee_deep_assoc t_deepassoc; */
 #define t_exec         (t_str_curr+28)              /* struct Dee_code_frame *t_exec; */
-#define t_except       (t_str_curr+32)              /* struct Dee_except_frame *t_except; */
-#define t_execsz       (t_str_curr+36)              /* uint16_t t_execsz; */
-#define t_exceptsz     (t_str_curr+38)              /* uint16_t t_exceptsz; */
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
+#define t_except       (t_exec+4)                   /* struct Dee_except_frame *t_except; */
+#define t_execsz       (t_exec+8)                   /* uint16_t t_execsz; */
+#define t_exceptsz     (t_exec+10)                  /* uint16_t t_exceptsz; */
 /* }; */
 
 /* struct Dee_except_handler { */

src/deemon/linker-scripts/link-deemon-gcc-i386-cygwin.def

@@ -1525,7 +1525,6 @@ EXPORTS
 	_Dee_Decref_traced@12=Dee_Decref_traced@12
 	_Dee_Decrefv@8=Dee_Decrefv@8
 	_Dee_Decrefv_traced@16=Dee_Decrefv_traced@16
-	_Dee_DeepCopyAddAssoc@8=Dee_DeepCopyAddAssoc@8
 	_Dee_DumpReferenceLeaks@0=Dee_DumpReferenceLeaks@0
 	_Dee_Exit@8=Dee_Exit@8
 	_Dee_Free@4=Dee_Free@4
@@ -1601,6 +1600,7 @@ EXPORTS
 	_Dee_attriterchain_builder_init@12=Dee_attriterchain_builder_init@12
 	_Dee_bytes_printer_alloc@8=Dee_bytes_printer_alloc@8
 	_Dee_bytes_printer_append@12=Dee_bytes_printer_append@12
+	_Dee_bytes_printer_init_ex@8=Dee_bytes_printer_init_ex@8
 	_Dee_bytes_printer_pack@4=Dee_bytes_printer_pack@4
 	_Dee_bytes_printer_print@12=Dee_bytes_printer_print@12
 	_Dee_bytes_printer_putb@8=Dee_bytes_printer_putb@8

src/deemon/linker-scripts/link-deemon-msvc-i386-win32.def

@@ -1525,7 +1525,6 @@ EXPORTS
 	Dee_Decref_traced@12=_Dee_Decref_traced@12
 	Dee_Decrefv@8=_Dee_Decrefv@8
 	Dee_Decrefv_traced@16=_Dee_Decrefv_traced@16
-	Dee_DeepCopyAddAssoc@8=_Dee_DeepCopyAddAssoc@8
 	Dee_DumpReferenceLeaks@0=_Dee_DumpReferenceLeaks@0
 	Dee_Exit@8=_Dee_Exit@8
 	Dee_Free@4=_Dee_Free@4
@@ -1601,6 +1600,7 @@ EXPORTS
 	Dee_attriterchain_builder_init@12=_Dee_attriterchain_builder_init@12
 	Dee_bytes_printer_alloc@8=_Dee_bytes_printer_alloc@8
 	Dee_bytes_printer_append@12=_Dee_bytes_printer_append@12
+	Dee_bytes_printer_init_ex@8=_Dee_bytes_printer_init_ex@8
 	Dee_bytes_printer_pack@4=_Dee_bytes_printer_pack@4
 	Dee_bytes_printer_print@12=_Dee_bytes_printer_print@12
 	Dee_bytes_printer_putb@8=_Dee_bytes_printer_putb@8

src/deemon/runtime/thread.c

@@ -863,6 +863,7 @@ PRIVATE DEFINE_STRING(main_thread_name, "MainThread");
 PUBLIC uint16_t DeeExec_StackLimit = Dee_EXEC_DEFAULT_STACK_LIMIT;
 
 
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 PRIVATE struct Dee_deep_assoc_entry empty_deep_assoc[] = {
 	{ NULL, NULL }
 };
@@ -1040,6 +1041,7 @@ deepcopy_clear(struct Dee_thread_object *__restrict thread_self) {
 		Dee_Free(begin);
 	}
 }
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 
 
 typedef struct os_thread_object {
@@ -1158,7 +1160,9 @@ INTERN DeeOSThreadObject DeeThread_Main = {
 		/* .t_str_curr   = */ NULL,
 		/* .t_repr_curr  = */ NULL,
 		/* .t_hash_curr  = */ NULL,
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 		/* .t_deepassoc  = */ { 0, 0, empty_deep_assoc, 0 },
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 		/* .t_exec       = */ NULL,
 		/* .t_except     = */ NULL,
 		/* .t_execsz     = */ 0,
@@ -1793,7 +1797,9 @@ DeeThread_AllocateCurrentThread(void) {
 	if unlikely(result == NULL)
 		return NULL;
 	DeeObject_Init(&result->at_os_thread.ot_thread, &DeeThread_Type);
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 	result->at_os_thread.ot_thread.t_deepassoc.da_list = empty_deep_assoc;
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 
 	/* Set expected thread flags. */
 	result->at_os_thread.ot_thread.t_state = 0 |
@@ -1962,9 +1968,11 @@ DeeThread_Secede(DREF DeeObject *thread_result) {
 	ASSERTF(self->t_str_curr == NULL, "Calling thread still has active calls to `DeeObject_Str'");
 	ASSERTF(self->t_repr_curr == NULL, "Calling thread still has active calls to `DeeObject_Repr'");
 	ASSERTF(self->t_hash_curr == NULL, "Calling thread still has active calls to `DeeObject_Hash'");
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 	ASSERTF(self->t_deepassoc.da_used == 0, "Calling thread still has active calls to `DeeObject_DeepCopy'");
 	ASSERT((self->t_deepassoc.da_mask != 0) ==
 	       (self->t_deepassoc.da_list != empty_deep_assoc));
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 	ASSERT(!self->t_threadname || DeeString_Check(self->t_threadname));
 
 	/* Set the TERMINATING flag to prevent further interrupts from being scheduled. */
@@ -2199,12 +2207,14 @@ INTERN void DCALL DeeThread_SubSystemFini(void) {
 	/* Finalize the main-thread object */
 	_DeeThread_FiniMainThread();
 
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 	/* Do some cleanup on the main-thread object */
 	if (DeeThread_Main.ot_thread.t_deepassoc.da_list != empty_deep_assoc)
 		Dee_Free(DeeThread_Main.ot_thread.t_deepassoc.da_list);
 	DeeThread_Main.ot_thread.t_deepassoc.da_used = 0;
 	DeeThread_Main.ot_thread.t_deepassoc.da_mask = 0;
 	DeeThread_Main.ot_thread.t_deepassoc.da_list = empty_deep_assoc;
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 
 	DBG_ALIGNMENT_ENABLE();
 }
@@ -3578,9 +3588,11 @@ thread_fini(DeeThreadObject *__restrict self) {
 #ifndef CONFIG_NO_THREADS
 	ASSERT(!LIST_ISBOUND(self, t_global));
 #endif /* !CONFIG_NO_THREADS */
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 	ASSERT(self->t_deepassoc.da_used == 0);
 	ASSERT(self->t_deepassoc.da_mask == 0);
 	ASSERT(self->t_deepassoc.da_list == empty_deep_assoc);
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 #ifndef CONFIG_NO_THREADS
 	ASSERT(self->t_threadname == NULL);
 #endif /* !CONFIG_NO_THREADS */
@@ -3605,11 +3617,13 @@ thread_fini(DeeThreadObject *__restrict self) {
 #endif /* !... */
 	}
 
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 	ASSERT(!self->t_deepassoc.da_used);
 	ASSERT((self->t_deepassoc.da_mask != 0) ==
 	       (self->t_deepassoc.da_list != empty_deep_assoc));
 	if (self->t_deepassoc.da_list != empty_deep_assoc)
 		Dee_Free(self->t_deepassoc.da_list);
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 	Dee_XDecref(self->t_threadname);
 	if (self->t_state & Dee_THREAD_STATE_STARTED) {
 		if (self->t_state & Dee_THREAD_STATE_TERMINATED) {
@@ -3653,7 +3667,9 @@ PUBLIC WUNUSED DREF DeeObject *DCALL DeeThread_FromTid(Dee_pid_t tid) {
 	                            Dee_THREAD_STATE_HASTID |
 	                            Dee_THREAD_STATE_UNMANAGED;
 	result->ot_tid = tid;
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 	result->ot_thread.t_deepassoc.da_list = empty_deep_assoc;
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 	DeeObject_Init(&result->ot_thread, &DeeThread_Type);
 	return DeeGC_Track(Dee_AsObject(&result->ot_thread));
 err:
@@ -3851,10 +3867,12 @@ thread_init(DeeThreadObject *__restrict self,
 		me->ot_thread.t_str_curr               = NULL;
 		me->ot_thread.t_repr_curr              = NULL;
 		me->ot_thread.t_hash_curr              = NULL;
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 		me->ot_thread.t_deepassoc.da_used      = 0;
 		me->ot_thread.t_deepassoc.da_mask      = 0;
 		me->ot_thread.t_deepassoc.da_list      = empty_deep_assoc;
 		me->ot_thread.t_deepassoc.da_recursion = 0;
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 		me->ot_thread.t_exec                   = NULL;
 		me->ot_thread.t_except                 = NULL;
 		me->ot_thread.t_execsz                 = 0;
@@ -3938,10 +3956,12 @@ thread_init(DeeThreadObject *__restrict self,
 	self->t_interrupt.ti_args = NULL;
 	self->t_global.le_prev    = NULL;
 	DBG_memset(&self->t_global.le_next, 0xcc, sizeof(self->t_global.le_next));
+#ifndef CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR
 	self->t_deepassoc.da_used      = 0;
 	self->t_deepassoc.da_mask      = 0;
 	self->t_deepassoc.da_list      = empty_deep_assoc;
 	self->t_deepassoc.da_recursion = 0;
+#endif /* !CONFIG_EXPERIMENTAL_SERIALIZE_OPERATOR */
 #ifdef CONFIG_EXPERIMENTAL_CUSTOM_HEAP
 	self->t_heap = NULL;
 #endif /* CONFIG_EXPERIMENTAL_CUSTOM_HEAP */

src/deemon/system/system-nt.c.inl

@@ -2243,7 +2243,7 @@ again:
 		if (memcasecmp(filename_str, pipe_prefix, COMPILER_STRLEN(pipe_prefix) * sizeof(char)) == 0) {
 			DBG_ALIGNMENT_DISABLE();
 			if (GetFileType(hFile) == FILE_TYPE_PIPE) {
-				DWORD new_mode = /*!(oflags & OPEN_FNONBLOCK) ? PIPE_WAIT :*/ PIPE_NOWAIT;
+				DWORD new_mode = /* !(oflags & OPEN_FNONBLOCK) ? PIPE_WAIT : */ PIPE_NOWAIT;
 				(void)SetNamedPipeHandleState(hFile, &new_mode, NULL, NULL);
 			}
 			DBG_ALIGNMENT_ENABLE();