# HG changeset patch # User Florian Pose # Date 1171278923 0 # Node ID f94a9f1bcaead91d2ed8bc093031c5369a70a0b3 # Parent 67be4381c820fe54114235925597fca3aa53ae4f Fixed bug causing unloading of realtime module being very slow after topology change. diff -r 67be4381c820 -r f94a9f1bcaea TODO --- a/TODO Mon Feb 12 11:12:00 2007 +0000 +++ b/TODO Mon Feb 12 11:15:23 2007 +0000 @@ -7,7 +7,6 @@ ------------------------------------------------------------------------------- * Release 1.2: - - Find bug causing slow unloading after topology change. - Introduce topology_change_pending. - Update feature lists. diff -r 67be4381c820 -r f94a9f1bcaea master/master.c --- a/master/master.c Mon Feb 12 11:12:00 2007 +0000 +++ b/master/master.c Mon Feb 12 11:15:23 2007 +0000 @@ -513,6 +513,15 @@ ec_slave_reset(slave); ec_slave_request_state(slave, EC_SLAVE_STATE_PREOP); + // don't try to set PREOP for slaves that don't respond, + // because of 3 second timeout. + if (!slave->online) { + if (master->debug_level) + EC_DBG("Skipping to configure offline slave %i.\n", + slave->ring_position); + continue; + } + ec_fsm_slave_start_conf(&fsm_slave, slave); while (ec_fsm_slave_exec(&fsm_slave)) { ec_master_sync_io(master);