ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.124 by root, Tue Jan 2 22:55:05 2007 UTC vs.
Revision 1.139 by root, Fri Jan 5 19:12:03 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 184=item cf::lock_wait $string
209 185
210Wait until the given lock is available. See cf::lock_acquire. 186Wait until the given lock is available. See cf::lock_acquire.
211 187
212=item my $lock = cf::lock_acquire $string 188=item my $lock = cf::lock_acquire $string
213 189
214Wait until the given lock is available and then acquires it and returns 190Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 192for example when the coroutine gets canceled), the lock is automatically
217returned. 193returned.
218 194
219Lock names should begin with a unique identifier (for example, find_map 195Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 196uses map_find and cf::map::load uses map_load).
221 197
222=cut 198=cut
223 199
224our %LOCK; 200our %LOCK;
225 201
… …
239 # wait, to be sure we are not locked 215 # wait, to be sure we are not locked
240 lock_wait $key; 216 lock_wait $key;
241 217
242 $LOCK{$key} = []; 218 $LOCK{$key} = [];
243 219
244 cf::guard { 220 Coro::guard {
245 # wake up all waiters, to be on the safe side 221 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 222 $_->ready for @{ delete $LOCK{$key} };
247 } 223 }
224}
225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
248} 232}
249 233
250=item cf::sync_job { BLOCK } 234=item cf::sync_job { BLOCK }
251 235
252The design of crossfire+ requires that the main coro ($Coro::main) is 236The design of crossfire+ requires that the main coro ($Coro::main) is
… …
267 # this is the main coro, too bad, we have to block 251 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 252 # till the operation succeeds, freezing the server :/
269 253
270 # TODO: use suspend/resume instead 254 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 255 # (but this is cancel-safe)
272 local $FREEZE = 1; 256 my $freeze_guard = freeze_mainloop;
273 257
274 my $busy = 1; 258 my $busy = 1;
275 my @res; 259 my @res;
276 260
277 (Coro::async { 261 (Coro::async_pool {
278 @res = eval { $job->() }; 262 @res = eval { $job->() };
279 warn $@ if $@; 263 warn $@ if $@;
280 undef $busy; 264 undef $busy;
281 })->prio (Coro::PRIO_MAX); 265 })->prio (Coro::PRIO_MAX);
282 266
283 while ($busy) { 267 while ($busy) {
284 Coro::cede_notself; 268 unless (Coro::cede) {
285 Event::one_event unless Coro::nready; 269 Coro::nready ? Event::one_event 0 : Event::one_event;
270 Coro::cede_notself unless Coro::cede;
271 }
286 } 272 }
287 273
288 wantarray ? @res : $res[0] 274 wantarray ? @res : $res[0]
289 } else { 275 } else {
290 # we are in another coroutine, how wonderful, everything just works 276 # we are in another coroutine, how wonderful, everything just works
… …
293 } 279 }
294} 280}
295 281
296=item $coro = cf::coro { BLOCK } 282=item $coro = cf::coro { BLOCK }
297 283
298Creates and returns a new coro. This coro is automcatially being canceled 284Creates (and readies) and returns a new coro. This coro is automcatially
299when the extension calling this is being unloaded. 285being canceled when the extension calling this is being unloaded.
300 286
301=cut 287=cut
302 288
303sub coro(&) { 289sub coro(&) {
304 my $cb = shift; 290 my $cb = shift;
305 291
306 my $coro; $coro = async { 292 my $coro = &Coro::async_pool ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 293
313 $coro->on_destroy (sub { 294 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 295 delete $EXT_CORO{$coro+0};
315 }); 296 });
316 $EXT_CORO{$coro+0} = $coro; 297 $EXT_CORO{$coro+0} = $coro;
… …
1126package cf::map; 1107package cf::map;
1127 1108
1128use Fcntl; 1109use Fcntl;
1129use Coro::AIO; 1110use Coro::AIO;
1130 1111
1131our $MAX_RESET = 7200; 1112our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1113our $DEFAULT_RESET = 3000;
1133 1114
1134sub generate_random_map { 1115sub generate_random_map {
1135 my ($path, $rmp) = @_; 1116 my ($path, $rmp) = @_;
1136 1117
1137 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
… …
1167 or return; 1148 or return;
1168 1149
1169 my $map = cf::map::new 1150 my $map = cf::map::new
1170 or return; 1151 or return;
1171 1152
1153 # for better error messages only, will be overwritten
1154 $map->path ($path);
1155
1172 $map->load_header ($path) 1156 $map->load_header ($path)
1173 or return; 1157 or return;
1174 1158
1175 $map->{load_path} = $path; 1159 $map->{load_path} = $path;
1176 1160
1177 $map 1161 $map
1178} 1162}
1179 1163
1164sub find;
1180sub find_map { 1165sub find {
1181 my ($path, $origin) = @_; 1166 my ($path, $origin) = @_;
1182 1167
1183 #warn "find_map<$path,$origin>\n";#d# 1168 #warn "find<$path,$origin>\n";#d#
1184 1169
1185 $path = new cf::path $path, $origin && $origin->path; 1170 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1171 my $key = $path->as_string;
1187 1172
1188 cf::lock_wait "map_find:$key"; 1173 cf::lock_wait "map_find:$key";
… …
1191 my $guard = cf::lock_acquire "map_find:$key"; 1176 my $guard = cf::lock_acquire "map_find:$key";
1192 1177
1193 # do it the slow way 1178 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1179 my $map = try_load_header $path->save_path;
1195 1180
1181 Coro::cede;
1182
1196 if ($map) { 1183 if ($map) {
1184 $map->last_access ((delete $map->{last_access})
1185 || $cf::RUNTIME); #d#
1197 # safety 1186 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1187 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1188 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1189 } else {
1201 if (my $rmp = $path->random_map_params) { 1190 if (my $rmp = $path->random_map_params) {
… …
1206 1195
1207 $map or return; 1196 $map or return;
1208 1197
1209 $map->{load_original} = 1; 1198 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1199 $map->{instantiate_time} = $cf::RUNTIME;
1200 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1201 $map->instantiate;
1212 1202
1213 # per-player maps become, after loading, normal maps 1203 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1204 $map->per_player (0) if $path->{user_rel};
1215 } 1205 }
1216 1206
1217 $map->path ($key); 1207 $map->path ($key);
1218 $map->{path} = $path; 1208 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1209 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1210
1211 Coro::cede;
1221 1212
1222 if ($map->should_reset) { 1213 if ($map->should_reset) {
1223 $map->reset; 1214 $map->reset;
1224 undef $guard; 1215 undef $guard;
1225 $map = cf::map::find_map ($path) 1216 $map = find $path
1226 or return; 1217 or return;
1227 } 1218 }
1228 1219
1229 $cf::MAP{$key} = $map 1220 $cf::MAP{$key} = $map
1230 } 1221 }
… …
1252 if (aio_open $uniq, O_RDONLY, 0) { 1243 if (aio_open $uniq, O_RDONLY, 0) {
1253 $self->clear_unique_items; 1244 $self->clear_unique_items;
1254 $self->load_objects ($uniq, 0); 1245 $self->load_objects ($uniq, 0);
1255 } 1246 }
1256 } 1247 }
1248
1249 Coro::cede;
1257 1250
1258 # now do the right thing for maps 1251 # now do the right thing for maps
1259 $self->link_multipart_objects; 1252 $self->link_multipart_objects;
1260 1253
1261 if ($self->{path}->is_style_map) { 1254 if ($self->{path}->is_style_map) {
… …
1269 $self->difficulty ($self->estimate_difficulty) 1262 $self->difficulty ($self->estimate_difficulty)
1270 unless $self->difficulty; 1263 unless $self->difficulty;
1271 $self->activate; 1264 $self->activate;
1272 } 1265 }
1273 1266
1267 Coro::cede;
1268
1274 $self->in_memory (cf::MAP_IN_MEMORY); 1269 $self->in_memory (cf::MAP_IN_MEMORY);
1275} 1270}
1276 1271
1277sub load_map_sync { 1272sub find_sync {
1278 my ($path, $origin) = @_; 1273 my ($path, $origin) = @_;
1279 1274
1280 #warn "load_map_sync<$path, $origin>\n";#d#
1281
1282 cf::sync_job { 1275 cf::sync_job {
1283 my $map = cf::map::find_map $path, $origin 1276 my $map = cf::map::find $path, $origin;
1284 or return;
1285 $map->load;
1286 $map 1277 $map
1287 } 1278 }
1279}
1280
1281sub do_load_sync {
1282 my ($map) = @_;
1283
1284 cf::sync_job { $map->load };
1288} 1285}
1289 1286
1290sub save { 1287sub save {
1291 my ($self) = @_; 1288 my ($self) = @_;
1292 1289
1290 my $lock = cf::lock_acquire "map_data:" . $self->path;
1291
1293 $self->{last_save} = $cf::RUNTIME; 1292 $self->{last_save} = $cf::RUNTIME;
1294 1293
1295 return unless $self->dirty; 1294 return unless $self->dirty;
1296 1295
1297 my $save = $self->{path}->save_path; utf8::encode $save; 1296 my $save = $self->{path}->save_path; utf8::encode $save;
1298 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1297 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1299 1298
1300 $self->{load_path} = $save; 1299 $self->{load_path} = $save;
1301 1300
1302 return if $self->{deny_save}; 1301 return if $self->{deny_save};
1302
1303 local $self->{last_access} = $self->last_access;#d#
1303 1304
1304 if ($uniq) { 1305 if ($uniq) {
1305 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1306 $self->save_objects ($uniq, cf::IO_UNIQUES); 1307 $self->save_objects ($uniq, cf::IO_UNIQUES);
1307 } else { 1308 } else {
… …
1310} 1311}
1311 1312
1312sub swap_out { 1313sub swap_out {
1313 my ($self) = @_; 1314 my ($self) = @_;
1314 1315
1316 # save first because save cedes
1317 $self->save;
1318
1319 my $lock = cf::lock_acquire "map_data:" . $self->path;
1320
1315 return if $self->players; 1321 return if $self->players;
1316 return if $self->in_memory != cf::MAP_IN_MEMORY; 1322 return if $self->in_memory != cf::MAP_IN_MEMORY;
1317 return if $self->{deny_save}; 1323 return if $self->{deny_save};
1318 1324
1319 $self->save;
1320 $self->clear; 1325 $self->clear;
1321 $self->in_memory (cf::MAP_SWAPPED); 1326 $self->in_memory (cf::MAP_SWAPPED);
1322} 1327}
1323 1328
1324sub reset_at { 1329sub reset_at {
… …
1362} 1367}
1363 1368
1364sub reset { 1369sub reset {
1365 my ($self) = @_; 1370 my ($self) = @_;
1366 1371
1372 my $lock = cf::lock_acquire "map_data:" . $self->path;
1373
1367 return if $self->players; 1374 return if $self->players;
1368 return if $self->{path}{user_rel};#d# 1375 return if $self->{path}{user_rel};#d#
1369 1376
1370 warn "resetting map ", $self->path;#d# 1377 warn "resetting map ", $self->path;#d#
1371 1378
… …
1390 1397
1391sub customise_for { 1398sub customise_for {
1392 my ($map, $ob) = @_; 1399 my ($map, $ob) = @_;
1393 1400
1394 if ($map->per_player) { 1401 if ($map->per_player) {
1395 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1402 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1396 } 1403 }
1397 1404
1398 $map 1405 $map
1399} 1406}
1400 1407
1401sub emergency_save { 1408sub emergency_save {
1402 local $cf::FREEZE = 1; 1409 my $freeze_guard = cf::freeze_mainloop;
1403 1410
1404 warn "enter emergency map save\n"; 1411 warn "enter emergency map save\n";
1405 1412
1406 cf::sync_job { 1413 cf::sync_job {
1407 warn "begin emergency map save\n"; 1414 warn "begin emergency map save\n";
… …
1497 my $link_pos = delete $self->{_link_pos}; 1504 my $link_pos = delete $self->{_link_pos};
1498 1505
1499 unless ($map) { 1506 unless ($map) {
1500 # restore original map position 1507 # restore original map position
1501 ($map, $x, $y) = @{ $link_pos || [] }; 1508 ($map, $x, $y) = @{ $link_pos || [] };
1502 $map = cf::map::find_map $map; 1509 $map = cf::map::find $map;
1503 1510
1504 unless ($map) { 1511 unless ($map) {
1505 ($map, $x, $y) = @$EMERGENCY_POSITION; 1512 ($map, $x, $y) = @$EMERGENCY_POSITION;
1506 $map = cf::map::find_map $map 1513 $map = cf::map::find $map
1507 or die "FATAL: cannot load emergency map\n"; 1514 or die "FATAL: cannot load emergency map\n";
1508 } 1515 }
1509 } 1516 }
1510 1517
1511 ($x, $y) = (-1, -1) 1518 ($x, $y) = (-1, -1)
… …
1536 my ($pl) = @_; 1543 my ($pl) = @_;
1537 1544
1538 # try to abort aborted map switching on player login :) 1545 # try to abort aborted map switching on player login :)
1539 # should happen only on crashes 1546 # should happen only on crashes
1540 if ($pl->ob->{_link_pos}) { 1547 if ($pl->ob->{_link_pos}) {
1548
1541 $pl->ob->enter_link; 1549 $pl->ob->enter_link;
1542 Coro::async { 1550 (Coro::async_pool {
1543 # we need this sleep as the login has a concurrent enter_exit running 1551 # we need this sleep as the login has a concurrent enter_exit running
1544 # and this sleep increases chances of the player not ending up in scorn 1552 # and this sleep increases chances of the player not ending up in scorn
1545 Coro::Timer::sleep 1; 1553 Coro::Timer::sleep 1;
1546 $pl->ob->leave_link; 1554 $pl->ob->leave_link;
1547 }; 1555 })->prio (2);
1548 } 1556 }
1549 }, 1557 },
1550); 1558);
1551 1559
1552=item $player_object->goto_map ($path, $x, $y) 1560=item $player_object->goto ($path, $x, $y)
1553 1561
1554=cut 1562=cut
1555 1563
1556sub cf::object::player::goto_map { 1564sub cf::object::player::goto {
1557 my ($self, $path, $x, $y) = @_; 1565 my ($self, $path, $x, $y) = @_;
1558 1566
1559 $self->enter_link; 1567 $self->enter_link;
1560 1568
1561 (Coro::async { 1569 (Coro::async_pool {
1562 $path = new cf::path $path; 1570 $path = new cf::path $path;
1563 1571
1564 my $map = cf::map::find_map $path->as_string; 1572 my $map = cf::map::find $path->as_string;
1565 $map = $map->customise_for ($self) if $map; 1573 $map = $map->customise_for ($self) if $map;
1566 1574
1567# warn "entering ", $map->path, " at ($x, $y)\n" 1575# warn "entering ", $map->path, " at ($x, $y)\n"
1568# if $map; 1576# if $map;
1569 1577
… …
1628 1636
1629 return unless $self->type == cf::PLAYER; 1637 return unless $self->type == cf::PLAYER;
1630 1638
1631 $self->enter_link; 1639 $self->enter_link;
1632 1640
1633 (Coro::async { 1641 (Coro::async_pool {
1642 $self->deactivate_recursive; # just to be sure
1634 unless (eval { 1643 unless (eval {
1635
1636 prepare_random_map $exit 1644 prepare_random_map $exit
1637 if $exit->slaying eq "/!"; 1645 if $exit->slaying eq "/!";
1638 1646
1639 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1647 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1640 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1648 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1641 1649
1642 1; 1650 1;
1643 }) { 1651 }) {
1644 $self->message ("Something went wrong deep within the crossfire server. " 1652 $self->message ("Something went wrong deep within the crossfire server. "
1645 . "I'll try to bring you back to the map you were before. " 1653 . "I'll try to bring you back to the map you were before. "
… …
1702 on_reply => sub { 1710 on_reply => sub {
1703 my ($ns, $msg) = @_; 1711 my ($ns, $msg) = @_;
1704 1712
1705 # this weird shuffling is so that direct followup queries 1713 # this weird shuffling is so that direct followup queries
1706 # get handled first 1714 # get handled first
1707 my $queue = delete $ns->{query_queue}; 1715 my $queue = delete $ns->{query_queue}
1716 or return; # be conservative, not sure how that can happen, but we saw a crash here
1708 1717
1709 (shift @$queue)->[1]->($msg); 1718 (shift @$queue)->[1]->($msg);
1710 1719
1711 push @{ $ns->{query_queue} }, @$queue; 1720 push @{ $ns->{query_queue} }, @$queue;
1712 1721
… …
1729=cut 1738=cut
1730 1739
1731sub cf::client::coro { 1740sub cf::client::coro {
1732 my ($self, $cb) = @_; 1741 my ($self, $cb) = @_;
1733 1742
1734 my $coro; $coro = async { 1743 my $coro = &Coro::async_pool ($cb);
1735 eval {
1736 $cb->();
1737 };
1738 warn $@ if $@;
1739 };
1740 1744
1741 $coro->on_destroy (sub { 1745 $coro->on_destroy (sub {
1742 delete $self->{_coro}{$coro+0}; 1746 delete $self->{_coro}{$coro+0};
1743 }); 1747 });
1744 1748
… …
1979 open my $fh, "<:utf8", cf::confdir . "/config" 1983 open my $fh, "<:utf8", cf::confdir . "/config"
1980 or return; 1984 or return;
1981 1985
1982 local $/; 1986 local $/;
1983 *CFG = YAML::Syck::Load <$fh>; 1987 *CFG = YAML::Syck::Load <$fh>;
1988
1989 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1990
1991 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
1992 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
1993
1994 if (exists $CFG{mlockall}) {
1995 eval {
1996 $CFG{mlockall} ? &mlockall : &munlockall
1997 and die "WARNING: m(un)lockall failed: $!\n";
1998 };
1999 warn $@ if $@;
2000 }
1984} 2001}
1985 2002
1986sub main { 2003sub main {
1987 # we must not ever block the main coroutine 2004 # we must not ever block the main coroutine
1988 local $Coro::idle = sub { 2005 local $Coro::idle = sub {
1989 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1990 (Coro::unblock_sub { 2007 Coro::async_pool { Event::one_event };
1991 Event::one_event;
1992 })->();
1993 }; 2008 };
1994 2009
1995 cfg_load; 2010 cfg_load;
1996 db_load; 2011 db_load;
1997 load_extensions; 2012 load_extensions;
… …
2008 return; 2023 return;
2009 } 2024 }
2010 2025
2011 warn "reloading..."; 2026 warn "reloading...";
2012 2027
2013 local $FREEZE = 1; 2028 my $guard = freeze_mainloop;
2014 cf::emergency_save; 2029 cf::emergency_save;
2015 2030
2016 eval { 2031 eval {
2017 # if anything goes wrong in here, we should simply crash as we already saved 2032 # if anything goes wrong in here, we should simply crash as we already saved
2018 2033
… …
2154 reentrant => 0, 2169 reentrant => 0,
2155 prio => 0, 2170 prio => 0,
2156 at => $NEXT_TICK || $TICK, 2171 at => $NEXT_TICK || $TICK,
2157 data => WF_AUTOCANCEL, 2172 data => WF_AUTOCANCEL,
2158 cb => sub { 2173 cb => sub {
2159 unless ($FREEZE) {
2160 cf::server_tick; # one server iteration 2174 cf::server_tick; # one server iteration
2161 $RUNTIME += $TICK; 2175 $RUNTIME += $TICK;
2162 }
2163
2164 $NEXT_TICK += $TICK; 2176 $NEXT_TICK += $TICK;
2165 2177
2166 # if we are delayed by four ticks or more, skip them all 2178 # if we are delayed by four ticks or more, skip them all
2167 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2179 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2168 2180
… …
2191 or warn "ERROR: unable to write runtime file: $!"; 2203 or warn "ERROR: unable to write runtime file: $!";
2192 })->(); 2204 })->();
2193 }, 2205 },
2194); 2206);
2195 2207
2208END { cf::emergency_save }
2209
21961 22101
2197 2211

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines