erts: Remove ERTS_SMP and USE_THREAD defines

This refactor was done using the unifdef tool like this:
    for file in $(find erts/ -name *.[ch]); do unifdef -t -f defile -o $file $file; done

where defile contained:
    #define ERTS_SMP 1
    #define USE_THREADS 1
    #define DDLL_SMP 1
    #define ERTS_HAVE_SMP_EMU 1
    #define SMP 1
    #define ERL_BITS_REENTRANT 1
    #define ERTS_USE_ASYNC_READY_Q 1
    #define FDBLOCK 1
    #undef ERTS_POLL_NEED_ASYNC_INTERRUPT_SUPPORT
    #define ERTS_POLL_ASYNC_INTERRUPT_SUPPORT 0
    #define ERTS_POLL_USE_WAKEUP_PIPE 1
    #define ERTS_POLL_USE_UPDATE_REQUESTS_QUEUE 1
    #undef ERTS_HAVE_PLAIN_EMU
    #undef ERTS_SIGNAL_STATE

1 files changed, 0 insertions, 55 deletions

diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index 0fb25c2082..3713b756e8 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -1931,27 +1931,6 @@ do_allocate_logger_message(Eterm gleader, Eterm **hp, ErlOffHeap **ohp,
     gl_sz = IS_CONST(gleader) ? 0 : size_object(gleader);
     sz = sz + gl_sz;
 
-#ifndef ERTS_SMP
-#ifdef USE_THREADS
-    if (!erts_get_scheduler_data()) /* Must be scheduler thread */
-	*p = NULL;
-    else
-#endif
-    {
-	*p = erts_whereis_process(NULL, 0, am_error_logger, 0, 0);
-	if (*p) {
-	    erts_aint32_t state = erts_smp_atomic32_read_acqb(&(*p)->state);
-	    if (state & (ERTS_PSFLG_RUNNING|ERTS_PSFLG_RUNNING_SYS))
-		*p = NULL;
-	}
-    }
-
-    if (!*p) {
-	return NIL;
-    }
-
-    /* So we have an error logger, lets build the message */
-#endif
     *bp = new_message_buffer(sz);
     *ohp = &(*bp)->off_heap;
     *hp = (*bp)->mem;
@@ -1969,20 +1948,12 @@ static void do_send_logger_message(Eterm *hp, ErlOffHeap *ohp, ErlHeapFragment *
 #ifdef HARDDEBUG
     erts_fprintf(stderr, "%T\n", message);
 #endif
-#ifdef ERTS_SMP
     {
 	Eterm from = erts_get_current_pid();
 	if (is_not_internal_pid(from))
 	    from = NIL;
 	erts_queue_error_logger_message(from, message, bp);
     }
-#else
-    {
-	ErtsMessage *mp = erts_alloc_message(0, NULL);
-	mp->data.heap_frag = bp;
-	erts_queue_message(p, 0, mp, message, am_system);
-    }
-#endif
 }
 
 /* error_logger !
@@ -4665,11 +4636,7 @@ erts_interval_init(erts_interval_t *icp)
 void
 erts_smp_interval_init(erts_interval_t *icp)
 {
-#ifdef ERTS_SMP
     erts_interval_init(icp);
-#else
-    icp->counter.not_atomic = 0;
-#endif
 #ifdef DEBUG
     icp->smp_api = 1;
 #endif
@@ -4727,22 +4694,14 @@ Uint64
 erts_smp_step_interval_nob(erts_interval_t *icp)
 {
     ASSERT(icp->smp_api);
-#ifdef ERTS_SMP
     return step_interval_nob(icp);
-#else
-    return ++icp->counter.not_atomic;
-#endif
 }
 
 Uint64
 erts_smp_step_interval_relb(erts_interval_t *icp)
 {
     ASSERT(icp->smp_api);
-#ifdef ERTS_SMP
     return step_interval_relb(icp);
-#else
-    return ++icp->counter.not_atomic;
-#endif
 }
 
 Uint64
@@ -4763,28 +4722,14 @@ Uint64
 erts_smp_ensure_later_interval_nob(erts_interval_t *icp, Uint64 ic)
 {
     ASSERT(icp->smp_api);
-#ifdef ERTS_SMP
     return ensure_later_interval_nob(icp, ic);
-#else
-    if (icp->counter.not_atomic > ic)
-	return icp->counter.not_atomic;
-    else
-	return ++icp->counter.not_atomic;
-#endif
 }
 
 Uint64
 erts_smp_ensure_later_interval_acqb(erts_interval_t *icp, Uint64 ic)
 {
     ASSERT(icp->smp_api);
-#ifdef ERTS_SMP
     return ensure_later_interval_acqb(icp, ic);
-#else
-    if (icp->counter.not_atomic > ic)
-	return icp->counter.not_atomic;
-    else
-	return ++icp->counter.not_atomic;
-#endif
 }
 
 /*