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, 22 deletions

diff --git a/erts/emulator/beam/erl_msacc.c b/erts/emulator/beam/erl_msacc.c
index 6c477be615..957358bcf5 100644
--- a/erts/emulator/beam/erl_msacc.c
+++ b/erts/emulator/beam/erl_msacc.c
@@ -48,11 +48,7 @@ static Eterm erts_msacc_gather_stats(ErtsMsAcc *msacc, ErtsHeapFactory *factory)
 static void erts_msacc_reset(ErtsMsAcc *msacc);
 static ErtsMsAcc* get_msacc(void);
 
-#ifdef USE_THREADS
 erts_tsd_key_t ERTS_WRITE_UNLIKELY(erts_msacc_key);
-#else
-ErtsMsAcc *ERTS_WRITE_UNLIKELY(erts_msacc) = NULL;
-#endif
 #ifndef ERTS_MSACC_ALWAYS_ON
 int ERTS_WRITE_UNLIKELY(erts_msacc_enabled);
 #endif
@@ -60,10 +56,8 @@ int ERTS_WRITE_UNLIKELY(erts_msacc_enabled);
 static Eterm *erts_msacc_state_atoms = NULL;
 static erts_rwmtx_t msacc_mutex;
 static ErtsMsAcc *msacc_managed = NULL;
-#ifdef USE_THREADS
 static ErtsMsAcc *msacc_unmanaged = NULL;
 static Uint msacc_unmanaged_count = 0;
-#endif
 
 #if ERTS_MSACC_STATE_COUNT < MAP_SMALL_MAP_LIMIT
 #define DEFAULT_MSACC_MSG_SIZE (3 + 1 + ERTS_MSACC_STATE_COUNT * 2 + 3 + ERTS_REF_THING_SIZE)
@@ -78,11 +72,7 @@ void erts_msacc_early_init(void) {
 #endif
     erts_rwmtx_init(&msacc_mutex, "msacc_list_mutex", NIL,
         ERTS_LOCK_FLAGS_PROPERTY_STATIC | ERTS_LOCK_FLAGS_CATEGORY_DEBUG);
-#ifdef USE_THREADS
     erts_tsd_key_create(&erts_msacc_key,"erts_msacc_key");
-#else
-    erts_msacc = NULL;
-#endif
 }
 
 void erts_msacc_init(void) {
@@ -107,7 +97,6 @@ void erts_msacc_init_thread(char *type, int id, int managed) {
     msacc->tid = erts_thr_self();
     msacc->perf_counter = 0;
 
-#ifdef USE_THREADS
     erts_rwmtx_rwlock(&msacc_mutex);
     if (!managed) {
         erts_mtx_init(&msacc->mtx, "msacc_unmanaged_mutex", NIL,
@@ -121,9 +110,6 @@ void erts_msacc_init_thread(char *type, int id, int managed) {
         msacc_managed = msacc;
     }
     erts_rwmtx_rwunlock(&msacc_mutex);
-#else
-    msacc_managed = msacc;
-#endif
 
     erts_msacc_reset(msacc);
 
@@ -370,12 +356,8 @@ erts_msacc_request(Process *c_p, int action, Eterm *threads)
     msaccrp->ref = STORE_NC(&hp, NULL, ref);
     msaccrp->req_sched = esdp->no;
 
-#ifdef ERTS_SMP
     *threads = erts_no_schedulers;
     *threads += 1; /* aux thread */
-#else
-    *threads = 1;
-#endif
 
     erts_smp_atomic32_init_nob(&msaccrp->refc,(erts_aint32_t)*threads);
 
@@ -386,12 +368,9 @@ erts_msacc_request(Process *c_p, int action, Eterm *threads)
                                           erts_no_schedulers,
                                           reply_msacc,
                                           (void *) msaccrp);
-#ifdef ERTS_SMP
     /* aux thread */
     erts_schedule_misc_aux_work(0, reply_msacc, (void *) msaccrp);
-#endif
 
-#ifdef USE_THREADS
     /* Manage unmanaged threads */
     switch (action) {
     case ERTS_MSACC_GATHER: {
@@ -468,7 +447,6 @@ erts_msacc_request(Process *c_p, int action, Eterm *threads)
     default: { ASSERT(0); }
     }
 
-#endif
 
     *threads = make_small(*threads);