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.119 by root, Tue Jan 2 08:26:42 2007 UTC vs.
Revision 1.136 by root, Fri Jan 5 01:06:28 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;
… …
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
184=item cf::lock_wait $string
185
186Wait until the given lock is available. See cf::lock_acquire.
187
188=item my $lock = cf::lock_acquire $string
189
190Wait until the given lock is available and then acquires it and returns
191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
192for example when the coroutine gets canceled), the lock is automatically
193returned.
194
195Lock names should begin with a unique identifier (for example, cf::map::find
196uses map_find and cf::map::load uses map_load).
197
198=cut
199
200our %LOCK;
201
202sub lock_wait($) {
203 my ($key) = @_;
204
205 # wait for lock, if any
206 while ($LOCK{$key}) {
207 push @{ $LOCK{$key} }, $Coro::current;
208 Coro::schedule;
209 }
210}
211
212sub lock_acquire($) {
213 my ($key) = @_;
214
215 # wait, to be sure we are not locked
216 lock_wait $key;
217
218 $LOCK{$key} = [];
219
220 Coro::guard {
221 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} };
223 }
224}
225
226=item cf::async { BLOCK }
227
228Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
229error instead of exiting the server in case of a problem.
230
231=cut
232
233sub async(&) {
234 my ($cb) = @_;
235
236 Coro::async {
237 eval { $cb->() };
238 warn $@ if $@;
239 }
240}
241
242sub freeze_mainloop {
243 return unless $TICK_WATCHER->is_active;
244
245 my $guard = Coro::guard { $TICK_WATCHER->start };
246 $TICK_WATCHER->stop;
247 $guard
248}
249
186=item cf::sync_job { BLOCK } 250=item cf::sync_job { BLOCK }
187 251
188The design of crossfire+ requires that the main coro ($Coro::main) is 252The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 253always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 254reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
203 # this is the main coro, too bad, we have to block 267 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 268 # till the operation succeeds, freezing the server :/
205 269
206 # TODO: use suspend/resume instead 270 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 271 # (but this is cancel-safe)
208 local $FREEZE = 1; 272 my $freeze_guard = freeze_mainloop;
209 273
210 my $busy = 1; 274 my $busy = 1;
211 my @res; 275 my @res;
212 276
213 (Coro::async { 277 (Coro::async {
… …
237=cut 301=cut
238 302
239sub coro(&) { 303sub coro(&) {
240 my $cb = shift; 304 my $cb = shift;
241 305
242 my $coro; $coro = async { 306 my $coro = &cf::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 307
249 $coro->on_destroy (sub { 308 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 309 delete $EXT_CORO{$coro+0};
251 }); 310 });
252 $EXT_CORO{$coro+0} = $coro; 311 $EXT_CORO{$coro+0} = $coro;
… …
1062package cf::map; 1121package cf::map;
1063 1122
1064use Fcntl; 1123use Fcntl;
1065use Coro::AIO; 1124use Coro::AIO;
1066 1125
1067our $MAX_RESET = 7200; 1126our $MAX_RESET = 3600;
1068our $DEFAULT_RESET = 3600; 1127our $DEFAULT_RESET = 3000;
1069 1128
1070sub generate_random_map { 1129sub generate_random_map {
1071 my ($path, $rmp) = @_; 1130 my ($path, $rmp) = @_;
1072 1131
1073 # mit "rum" bekleckern, nicht 1132 # mit "rum" bekleckern, nicht
… …
1089# and all this just because we cannot iterate over 1148# and all this just because we cannot iterate over
1090# all maps in C++... 1149# all maps in C++...
1091sub change_all_map_light { 1150sub change_all_map_light {
1092 my ($change) = @_; 1151 my ($change) = @_;
1093 1152
1094 $_->change_map_light ($change) for values %cf::MAP; 1153 $_->change_map_light ($change)
1154 for grep $_->outdoor, values %cf::MAP;
1095} 1155}
1096 1156
1097sub try_load_header($) { 1157sub try_load_header($) {
1098 my ($path) = @_; 1158 my ($path) = @_;
1099 1159
… …
1102 or return; 1162 or return;
1103 1163
1104 my $map = cf::map::new 1164 my $map = cf::map::new
1105 or return; 1165 or return;
1106 1166
1167 # for better error messages only, will be overwritten
1168 $map->path ($path);
1169
1107 $map->load_header ($path) 1170 $map->load_header ($path)
1108 or return; 1171 or return;
1109 1172
1110 $map->{load_path} = $path; 1173 $map->{load_path} = $path;
1111 1174
1112 $map 1175 $map
1113} 1176}
1114 1177
1178sub find;
1115sub find_map { 1179sub find {
1116 my ($path, $origin) = @_; 1180 my ($path, $origin) = @_;
1117 1181
1118 #warn "find_map<$path,$origin>\n";#d# 1182 #warn "find<$path,$origin>\n";#d#
1119 1183
1120 $path = new cf::path $path, $origin && $origin->path; 1184 $path = new cf::path $path, $origin && $origin->path;
1121 my $key = $path->as_string; 1185 my $key = $path->as_string;
1122 1186
1187 cf::lock_wait "map_find:$key";
1188
1123 $cf::MAP{$key} || do { 1189 $cf::MAP{$key} || do {
1190 my $guard = cf::lock_acquire "map_find:$key";
1191
1124 # do it the slow way 1192 # do it the slow way
1125 my $map = try_load_header $path->save_path; 1193 my $map = try_load_header $path->save_path;
1126 1194
1195 Coro::cede;
1196
1127 if ($map) { 1197 if ($map) {
1198 $map->last_access ((delete $map->{last_access})
1199 || $cf::RUNTIME); #d#
1128 # safety 1200 # safety
1129 $map->{instantiate_time} = $cf::RUNTIME 1201 $map->{instantiate_time} = $cf::RUNTIME
1130 if $map->{instantiate_time} > $cf::RUNTIME; 1202 if $map->{instantiate_time} > $cf::RUNTIME;
1131 } else { 1203 } else {
1132 if (my $rmp = $path->random_map_params) { 1204 if (my $rmp = $path->random_map_params) {
… …
1137 1209
1138 $map or return; 1210 $map or return;
1139 1211
1140 $map->{load_original} = 1; 1212 $map->{load_original} = 1;
1141 $map->{instantiate_time} = $cf::RUNTIME; 1213 $map->{instantiate_time} = $cf::RUNTIME;
1214 $map->last_access ($cf::RUNTIME);
1142 $map->instantiate; 1215 $map->instantiate;
1143 1216
1144 # per-player maps become, after loading, normal maps 1217 # per-player maps become, after loading, normal maps
1145 $map->per_player (0) if $path->{user_rel}; 1218 $map->per_player (0) if $path->{user_rel};
1146 } 1219 }
1147 #Coro::Timer::sleep 1;#d#
1148 1220
1149 $map->path ($key); 1221 $map->path ($key);
1150 $map->{path} = $path; 1222 $map->{path} = $path;
1151 $map->{last_save} = $cf::RUNTIME; 1223 $map->{last_save} = $cf::RUNTIME;
1152 $map->last_access ($cf::RUNTIME); 1224
1225 Coro::cede;
1153 1226
1154 if ($map->should_reset) { 1227 if ($map->should_reset) {
1155 $map->reset; 1228 $map->reset;
1229 undef $guard;
1156 $map = find_map $path; 1230 $map = find $path
1231 or return;
1157 } 1232 }
1158 1233
1159 $cf::MAP{$key} = $map 1234 $cf::MAP{$key} = $map
1160 } 1235 }
1161} 1236}
1162 1237
1163sub load { 1238sub load {
1164 my ($self) = @_; 1239 my ($self) = @_;
1165 1240
1241 my $path = $self->{path};
1242 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1243
1166 return if $self->in_memory != cf::MAP_SWAPPED; 1244 return if $self->in_memory != cf::MAP_SWAPPED;
1167 1245
1168 $self->in_memory (cf::MAP_LOADING); 1246 $self->in_memory (cf::MAP_LOADING);
1169
1170 my $path = $self->{path};
1171 1247
1172 $self->alloc; 1248 $self->alloc;
1173 $self->load_objects ($self->{load_path}, 1) 1249 $self->load_objects ($self->{load_path}, 1)
1174 or return; 1250 or return;
1175 1251
… …
1181 if (aio_open $uniq, O_RDONLY, 0) { 1257 if (aio_open $uniq, O_RDONLY, 0) {
1182 $self->clear_unique_items; 1258 $self->clear_unique_items;
1183 $self->load_objects ($uniq, 0); 1259 $self->load_objects ($uniq, 0);
1184 } 1260 }
1185 } 1261 }
1262
1263 Coro::cede;
1186 1264
1187 # now do the right thing for maps 1265 # now do the right thing for maps
1188 $self->link_multipart_objects; 1266 $self->link_multipart_objects;
1189 1267
1190 if ($self->{path}->is_style_map) { 1268 if ($self->{path}->is_style_map) {
… …
1198 $self->difficulty ($self->estimate_difficulty) 1276 $self->difficulty ($self->estimate_difficulty)
1199 unless $self->difficulty; 1277 unless $self->difficulty;
1200 $self->activate; 1278 $self->activate;
1201 } 1279 }
1202 1280
1281 Coro::cede;
1282
1203 $self->in_memory (cf::MAP_IN_MEMORY); 1283 $self->in_memory (cf::MAP_IN_MEMORY);
1204} 1284}
1205 1285
1206sub load_map_sync { 1286sub find_sync {
1207 my ($path, $origin) = @_; 1287 my ($path, $origin) = @_;
1208 1288
1209 #warn "load_map_sync<$path, $origin>\n";#d# 1289 cf::sync_job { cf::map::find $path, $origin }
1290}
1210 1291
1211 cf::sync_job { 1292sub do_load_sync {
1212 my $map = cf::map::find_map $path, $origin 1293 my ($map) = @_;
1213 or return; 1294
1214 $map->load; 1295 cf::sync_job { $map->load };
1215 $map
1216 }
1217} 1296}
1218 1297
1219sub save { 1298sub save {
1220 my ($self) = @_; 1299 my ($self) = @_;
1221 1300
… …
1227 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1306 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1228 1307
1229 $self->{load_path} = $save; 1308 $self->{load_path} = $save;
1230 1309
1231 return if $self->{deny_save}; 1310 return if $self->{deny_save};
1311
1312 local $self->{last_access} = $self->last_access;#d#
1232 1313
1233 if ($uniq) { 1314 if ($uniq) {
1234 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1235 $self->save_objects ($uniq, cf::IO_UNIQUES); 1316 $self->save_objects ($uniq, cf::IO_UNIQUES);
1236 } else { 1317 } else {
… …
1239} 1320}
1240 1321
1241sub swap_out { 1322sub swap_out {
1242 my ($self) = @_; 1323 my ($self) = @_;
1243 1324
1325 # save first because save cedes
1326 $self->save;
1327
1244 return if $self->players; 1328 return if $self->players;
1245 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1246 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1247 1331
1248 $self->save;
1249 $self->clear; 1332 $self->clear;
1250 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1251} 1334}
1252 1335
1253sub reset_at { 1336sub reset_at {
… …
1319 1402
1320sub customise_for { 1403sub customise_for {
1321 my ($map, $ob) = @_; 1404 my ($map, $ob) = @_;
1322 1405
1323 if ($map->per_player) { 1406 if ($map->per_player) {
1324 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1407 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1325 } 1408 }
1326 1409
1327 $map 1410 $map
1328} 1411}
1329 1412
1330sub emergency_save { 1413sub emergency_save {
1331 local $cf::FREEZE = 1; 1414 my $freeze_guard = cf::freeze_mainloop;
1332 1415
1333 warn "enter emergency map save\n"; 1416 warn "enter emergency map save\n";
1334 1417
1335 cf::sync_job { 1418 cf::sync_job {
1336 warn "begin emergency map save\n"; 1419 warn "begin emergency map save\n";
… …
1408=cut 1491=cut
1409 1492
1410sub cf::object::player::enter_link { 1493sub cf::object::player::enter_link {
1411 my ($self) = @_; 1494 my ($self) = @_;
1412 1495
1496 $self->deactivate_recursive;
1497
1413 return if $self->map == $LINK_MAP; 1498 return if $self->map == $LINK_MAP;
1414 1499
1415 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1416 if $self->map; 1501 if $self->map;
1417 1502
1418 $self->enter_map ($LINK_MAP, 20, 20); 1503 $self->enter_map ($LINK_MAP, 20, 20);
1419 $self->deactivate_recursive;
1420} 1504}
1421 1505
1422sub cf::object::player::leave_link { 1506sub cf::object::player::leave_link {
1423 my ($self, $map, $x, $y) = @_; 1507 my ($self, $map, $x, $y) = @_;
1424 1508
1425 my $link_pos = delete $self->{_link_pos}; 1509 my $link_pos = delete $self->{_link_pos};
1426 1510
1427 unless ($map) { 1511 unless ($map) {
1428 # restore original map position 1512 # restore original map position
1429 ($map, $x, $y) = @{ $link_pos || [] }; 1513 ($map, $x, $y) = @{ $link_pos || [] };
1430 $map = cf::map::find_map $map; 1514 $map = cf::map::find $map;
1431 1515
1432 unless ($map) { 1516 unless ($map) {
1433 ($map, $x, $y) = @$EMERGENCY_POSITION; 1517 ($map, $x, $y) = @$EMERGENCY_POSITION;
1434 $map = cf::map::find_map $map 1518 $map = cf::map::find $map
1435 or die "FATAL: cannot load emergency map\n"; 1519 or die "FATAL: cannot load emergency map\n";
1436 } 1520 }
1437 } 1521 }
1438 1522
1439 ($x, $y) = (-1, -1) 1523 ($x, $y) = (-1, -1)
… …
1447 1531
1448 $self->activate_recursive; 1532 $self->activate_recursive;
1449 $self->enter_map ($map, $x, $y); 1533 $self->enter_map ($map, $x, $y);
1450} 1534}
1451 1535
1536cf::player->attach (
1537 on_logout => sub {
1538 my ($pl) = @_;
1539
1540 # abort map switching before logout
1541 if ($pl->ob->{_link_pos}) {
1542 cf::sync_job {
1543 $pl->ob->leave_link
1544 };
1545 }
1546 },
1547 on_login => sub {
1548 my ($pl) = @_;
1549
1550 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link;
1554 cf::async {
1555 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn
1557 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link;
1559 };
1560 }
1561 },
1562);
1563
1452=item $player_object->goto_map ($path, $x, $y) 1564=item $player_object->goto ($path, $x, $y)
1453 1565
1454=cut 1566=cut
1455 1567
1456sub cf::object::player::goto_map { 1568sub cf::object::player::goto {
1457 my ($self, $path, $x, $y) = @_; 1569 my ($self, $path, $x, $y) = @_;
1458 1570
1459 $self->enter_link; 1571 $self->enter_link;
1460 1572
1461 (Coro::async { 1573 (cf::async {
1462 $path = new cf::path $path; 1574 $path = new cf::path $path;
1463 1575
1464 my $map = cf::map::find_map $path->as_string; 1576 my $map = cf::map::find $path->as_string;
1465 $map = $map->customise_for ($self) if $map; 1577 $map = $map->customise_for ($self) if $map;
1466 1578
1467# warn "entering ", $map->path, " at ($x, $y)\n" 1579# warn "entering ", $map->path, " at ($x, $y)\n"
1468# if $map; 1580# if $map;
1469 1581
… …
1528 1640
1529 return unless $self->type == cf::PLAYER; 1641 return unless $self->type == cf::PLAYER;
1530 1642
1531 $self->enter_link; 1643 $self->enter_link;
1532 1644
1533 (Coro::async { 1645 (cf::async {
1646 $self->deactivate_recursive; # just to be sure
1534 unless (eval { 1647 unless (eval {
1535
1536 prepare_random_map $exit 1648 prepare_random_map $exit
1537 if $exit->slaying eq "/!"; 1649 if $exit->slaying eq "/!";
1538 1650
1539 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1540 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1652 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1541 1653
1542 1; 1654 1;
1543 }) { 1655 }) {
1544 $self->message ("Something went wrong deep within the crossfire server. " 1656 $self->message ("Something went wrong deep within the crossfire server. "
1545 . "I'll try to bring you back to the map you were before. " 1657 . "I'll try to bring you back to the map you were before. "
… …
1602 on_reply => sub { 1714 on_reply => sub {
1603 my ($ns, $msg) = @_; 1715 my ($ns, $msg) = @_;
1604 1716
1605 # this weird shuffling is so that direct followup queries 1717 # this weird shuffling is so that direct followup queries
1606 # get handled first 1718 # get handled first
1607 my $queue = delete $ns->{query_queue}; 1719 my $queue = delete $ns->{query_queue}
1720 or return; # be conservative, not sure how that can happen, but we saw a crash here
1608 1721
1609 (shift @$queue)->[1]->($msg); 1722 (shift @$queue)->[1]->($msg);
1610 1723
1611 push @{ $ns->{query_queue} }, @$queue; 1724 push @{ $ns->{query_queue} }, @$queue;
1612 1725
… …
1629=cut 1742=cut
1630 1743
1631sub cf::client::coro { 1744sub cf::client::coro {
1632 my ($self, $cb) = @_; 1745 my ($self, $cb) = @_;
1633 1746
1634 my $coro; $coro = async { 1747 my $coro = &cf::async ($cb);
1635 eval {
1636 $cb->();
1637 };
1638 warn $@ if $@;
1639 };
1640 1748
1641 $coro->on_destroy (sub { 1749 $coro->on_destroy (sub {
1642 delete $self->{_coro}{$coro+0}; 1750 delete $self->{_coro}{$coro+0};
1643 }); 1751 });
1644 1752
… …
1816 1924
1817{ 1925{
1818 my $path = cf::localdir . "/database.pst"; 1926 my $path = cf::localdir . "/database.pst";
1819 1927
1820 sub db_load() { 1928 sub db_load() {
1821 warn "loading database $path\n";#d# remove later
1822 $DB = stat $path ? Storable::retrieve $path : { }; 1929 $DB = stat $path ? Storable::retrieve $path : { };
1823 } 1930 }
1824 1931
1825 my $pid; 1932 my $pid;
1826 1933
1827 sub db_save() { 1934 sub db_save() {
1828 warn "saving database $path\n";#d# remove later
1829 waitpid $pid, 0 if $pid; 1935 waitpid $pid, 0 if $pid;
1830 if (0 == ($pid = fork)) { 1936 if (0 == ($pid = fork)) {
1831 $DB->{_meta}{version} = 1; 1937 $DB->{_meta}{version} = 1;
1832 Storable::nstore $DB, "$path~"; 1938 Storable::nstore $DB, "$path~";
1833 rename "$path~", $path; 1939 rename "$path~", $path;
… …
1881 open my $fh, "<:utf8", cf::confdir . "/config" 1987 open my $fh, "<:utf8", cf::confdir . "/config"
1882 or return; 1988 or return;
1883 1989
1884 local $/; 1990 local $/;
1885 *CFG = YAML::Syck::Load <$fh>; 1991 *CFG = YAML::Syck::Load <$fh>;
1992
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994
1995 if (exists $CFG{mlockall}) {
1996 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall
1998 and die "WARNING: m(un)lockall failed: $!\n";
1999 };
2000 warn $@ if $@;
2001 }
1886} 2002}
1887 2003
1888sub main { 2004sub main {
1889 # we must not ever block the main coroutine 2005 # we must not ever block the main coroutine
1890 local $Coro::idle = sub { 2006 local $Coro::idle = sub {
… …
1910 return; 2026 return;
1911 } 2027 }
1912 2028
1913 warn "reloading..."; 2029 warn "reloading...";
1914 2030
1915 local $FREEZE = 1; 2031 my $guard = freeze_mainloop;
1916 cf::emergency_save; 2032 cf::emergency_save;
1917 2033
1918 eval { 2034 eval {
1919 # if anything goes wrong in here, we should simply crash as we already saved 2035 # if anything goes wrong in here, we should simply crash as we already saved
1920 2036
… …
2056 reentrant => 0, 2172 reentrant => 0,
2057 prio => 0, 2173 prio => 0,
2058 at => $NEXT_TICK || $TICK, 2174 at => $NEXT_TICK || $TICK,
2059 data => WF_AUTOCANCEL, 2175 data => WF_AUTOCANCEL,
2060 cb => sub { 2176 cb => sub {
2061 unless ($FREEZE) {
2062 cf::server_tick; # one server iteration 2177 cf::server_tick; # one server iteration
2063 $RUNTIME += $TICK; 2178 $RUNTIME += $TICK;
2064 }
2065
2066 $NEXT_TICK += $TICK; 2179 $NEXT_TICK += $TICK;
2067 2180
2068 # if we are delayed by four ticks or more, skip them all 2181 # if we are delayed by four ticks or more, skip them all
2069 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2182 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2070 2183
… …
2093 or warn "ERROR: unable to write runtime file: $!"; 2206 or warn "ERROR: unable to write runtime file: $!";
2094 })->(); 2207 })->();
2095 }, 2208 },
2096); 2209);
2097 2210
2211END { cf::emergency_save }
2212
20981 22131
2099 2214

Diff Legend

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