Kill off stillborn fsm threading stuff

diff --git a/lib/fsm.c b/lib/fsm.c
index 7dfe5d9..5a23e35 100644 (file)
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -23,8 +23,6 @@
 #define        _FSM_DEBUG      0
 int _fsm_debug = _FSM_DEBUG;
 
-int _fsm_threads = 0;
-
 /* XXX Failure to remove is not (yet) cause for failure. */
 static int strict_erasures = 0;
 
@@ -397,17 +395,9 @@ const char * dnlNextIterator(DNLI_t dnli)
     return dn;
 }
 
-static void * fsmThread(void * arg)
-{
-    FSM_t fsm = arg;
-    return ((void *) ((long) fsmStage(fsm, fsm->nstage)));
-}
-
 int fsmNext(FSM_t fsm, fileStage nstage)
 {
     fsm->nstage = nstage;
-    if (_fsm_threads)
-       return rpmsqJoin( rpmsqThread(fsmThread, fsm) );
     return fsmStage(fsm, fsm->nstage);
 }
 

diff --git a/lib/poptALL.c b/lib/poptALL.c
index 7bc3a92..50dfd5c 100644 (file)
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -29,8 +29,6 @@ extern int _rpmds_nopromote;
 
 extern int _fsm_debug;
 
-extern int _fsm_threads;
-
 extern int _hdr_debug;
 
 extern int _print_pkts;
@@ -254,8 +252,6 @@ struct poptOption rpmcliAllPoptTable[] = {
 
  { "fsmdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_fsm_debug, -1,
        N_("debug payload file state machine"), NULL},
- { "fsmthreads", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_fsm_threads, -1,
-       N_("use threads for file state machine"), NULL},
  { "hdrdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_hdr_debug, -1,
        NULL, NULL},
  { "prtpkts", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_print_pkts, -1,