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.116 by root, Mon Jan 1 17:30:34 2007 UTC vs.
Revision 1.134 by root, Thu Jan 4 17:28:49 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 my $guard = cf::guard { BLOCK }
185
186Run the given callback when the guard object gets destroyed (useful for
187coroutine cancellations).
188
189You can call C<< ->cancel >> on the guard object to stop the block from
190being executed.
191
192=cut
193
194sub guard(&) {
195 bless \(my $cb = $_[0]), cf::guard::;
196}
197
198sub cf::guard::cancel {
199 ${$_[0]} = sub { };
200}
201
202sub cf::guard::DESTROY {
203 ${$_[0]}->();
204}
205
206=item cf::lock_wait $string
207
208Wait until the given lock is available. See cf::lock_acquire.
209
210=item my $lock = cf::lock_acquire $string
211
212Wait until the given lock is available and then acquires it and returns
213a guard object. If the guard object gets destroyed (goes out of scope,
214for example when the coroutine gets canceled), the lock is automatically
215returned.
216
217Lock names should begin with a unique identifier (for example, cf::map::find
218uses map_find and cf::map::load uses map_load).
219
220=cut
221
222our %LOCK;
223
224sub lock_wait($) {
225 my ($key) = @_;
226
227 # wait for lock, if any
228 while ($LOCK{$key}) {
229 push @{ $LOCK{$key} }, $Coro::current;
230 Coro::schedule;
231 }
232}
233
234sub lock_acquire($) {
235 my ($key) = @_;
236
237 # wait, to be sure we are not locked
238 lock_wait $key;
239
240 $LOCK{$key} = [];
241
242 cf::guard {
243 # wake up all waiters, to be on the safe side
244 $_->ready for @{ delete $LOCK{$key} };
245 }
246}
247
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active;
266
267 my $guard = guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop;
269 $guard
270}
271
186=item cf::sync_job { BLOCK } 272=item cf::sync_job { BLOCK }
187 273
188The design of crossfire+ requires that the main coro ($Coro::main) is 274The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 275always 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. 276reentrant. 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 289 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 290 # till the operation succeeds, freezing the server :/
205 291
206 # TODO: use suspend/resume instead 292 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 293 # (but this is cancel-safe)
208 local $FREEZE = 1; 294 my $freeze_guard = freeze_mainloop;
209 295
210 my $busy = 1; 296 my $busy = 1;
211 my @res; 297 my @res;
212 298
213 (Coro::async { 299 (Coro::async {
… …
237=cut 323=cut
238 324
239sub coro(&) { 325sub coro(&) {
240 my $cb = shift; 326 my $cb = shift;
241 327
242 my $coro; $coro = async { 328 my $coro = &cf::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 329
249 $coro->on_destroy (sub { 330 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 331 delete $EXT_CORO{$coro+0};
251 }); 332 });
252 $EXT_CORO{$coro+0} = $coro; 333 $EXT_CORO{$coro+0} = $coro;
… …
817 (aio_load "$filename.pst", $av) >= 0 898 (aio_load "$filename.pst", $av) >= 0
818 or return; 899 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 900 $av = eval { (Storable::thaw $av)->{objs} };
820 } 901 }
821 902
903 warn sprintf "loading %s (%d)\n",
904 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 905 return ($data, $av);
823} 906}
824 907
825############################################################################# 908#############################################################################
826# command handling &c 909# command handling &c
… …
1060package cf::map; 1143package cf::map;
1061 1144
1062use Fcntl; 1145use Fcntl;
1063use Coro::AIO; 1146use Coro::AIO;
1064 1147
1065our $MAX_RESET = 7200; 1148our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1149our $DEFAULT_RESET = 3000;
1067 1150
1068sub generate_random_map { 1151sub generate_random_map {
1069 my ($path, $rmp) = @_; 1152 my ($path, $rmp) = @_;
1070 1153
1071 # mit "rum" bekleckern, nicht 1154 # mit "rum" bekleckern, nicht
… …
1087# and all this just because we cannot iterate over 1170# and all this just because we cannot iterate over
1088# all maps in C++... 1171# all maps in C++...
1089sub change_all_map_light { 1172sub change_all_map_light {
1090 my ($change) = @_; 1173 my ($change) = @_;
1091 1174
1092 $_->change_map_light ($change) for values %cf::MAP; 1175 $_->change_map_light ($change)
1176 for grep $_->outdoor, values %cf::MAP;
1093} 1177}
1094 1178
1095sub try_load_header($) { 1179sub try_load_header($) {
1096 my ($path) = @_; 1180 my ($path) = @_;
1097 1181
… …
1108 $map->{load_path} = $path; 1192 $map->{load_path} = $path;
1109 1193
1110 $map 1194 $map
1111} 1195}
1112 1196
1197sub find;
1113sub find_map { 1198sub find {
1114 my ($path, $origin) = @_; 1199 my ($path, $origin) = @_;
1115 1200
1116 #warn "find_map<$path,$origin>\n";#d# 1201 #warn "find<$path,$origin>\n";#d#
1117 1202
1118 $path = new cf::path $path, $origin && $origin->path; 1203 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1204 my $key = $path->as_string;
1120 1205
1206 cf::lock_wait "map_find:$key";
1207
1121 $cf::MAP{$key} || do { 1208 $cf::MAP{$key} || do {
1209 my $guard = cf::lock_acquire "map_find:$key";
1210
1122 # do it the slow way 1211 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1212 my $map = try_load_header $path->save_path;
1124 1213
1214 Coro::cede;
1215
1125 if ($map) { 1216 if ($map) {
1217 $map->last_access ((delete $map->{last_access})
1218 || $cf::RUNTIME); #d#
1126 # safety 1219 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1220 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1221 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1222 } else {
1130 if (my $rmp = $path->random_map_params) { 1223 if (my $rmp = $path->random_map_params) {
… …
1135 1228
1136 $map or return; 1229 $map or return;
1137 1230
1138 $map->{load_original} = 1; 1231 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1232 $map->{instantiate_time} = $cf::RUNTIME;
1233 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1234 $map->instantiate;
1141 1235
1142 # per-player maps become, after loading, normal maps 1236 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1237 $map->per_player (0) if $path->{user_rel};
1144 } 1238 }
1145 1239
1146 $map->path ($key); 1240 $map->path ($key);
1147 $map->{path} = $path; 1241 $map->{path} = $path;
1148 $map->{last_save} = $cf::RUNTIME; 1242 $map->{last_save} = $cf::RUNTIME;
1149 $map->last_access ($cf::RUNTIME); 1243
1244 Coro::cede;
1150 1245
1151 if ($map->should_reset) { 1246 if ($map->should_reset) {
1152 $map->reset; 1247 $map->reset;
1248 undef $guard;
1153 $map = find_map $path; 1249 $map = find $path
1250 or return;
1154 } 1251 }
1155 1252
1156 $cf::MAP{$key} = $map 1253 $cf::MAP{$key} = $map
1157 } 1254 }
1158} 1255}
1159 1256
1160sub load { 1257sub load {
1161 my ($self) = @_; 1258 my ($self) = @_;
1162 1259
1260 my $path = $self->{path};
1261 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1262
1163 return if $self->in_memory != cf::MAP_SWAPPED; 1263 return if $self->in_memory != cf::MAP_SWAPPED;
1164 1264
1165 $self->in_memory (cf::MAP_LOADING); 1265 $self->in_memory (cf::MAP_LOADING);
1166
1167 my $path = $self->{path};
1168 1266
1169 $self->alloc; 1267 $self->alloc;
1170 $self->load_objects ($self->{load_path}, 1) 1268 $self->load_objects ($self->{load_path}, 1)
1171 or return; 1269 or return;
1172 1270
… …
1178 if (aio_open $uniq, O_RDONLY, 0) { 1276 if (aio_open $uniq, O_RDONLY, 0) {
1179 $self->clear_unique_items; 1277 $self->clear_unique_items;
1180 $self->load_objects ($uniq, 0); 1278 $self->load_objects ($uniq, 0);
1181 } 1279 }
1182 } 1280 }
1281
1282 Coro::cede;
1183 1283
1184 # now do the right thing for maps 1284 # now do the right thing for maps
1185 $self->link_multipart_objects; 1285 $self->link_multipart_objects;
1186 1286
1187 if ($self->{path}->is_style_map) { 1287 if ($self->{path}->is_style_map) {
… …
1195 $self->difficulty ($self->estimate_difficulty) 1295 $self->difficulty ($self->estimate_difficulty)
1196 unless $self->difficulty; 1296 unless $self->difficulty;
1197 $self->activate; 1297 $self->activate;
1198 } 1298 }
1199 1299
1300 Coro::cede;
1301
1200 $self->in_memory (cf::MAP_IN_MEMORY); 1302 $self->in_memory (cf::MAP_IN_MEMORY);
1201} 1303}
1202 1304
1203sub load_map_sync { 1305sub find_sync {
1204 my ($path, $origin) = @_; 1306 my ($path, $origin) = @_;
1205 1307
1206 #warn "load_map_sync<$path, $origin>\n";#d# 1308 cf::sync_job { cf::map::find $path, $origin }
1309}
1207 1310
1208 cf::sync_job { 1311sub do_load_sync {
1209 my $map = cf::map::find_map $path, $origin 1312 my ($map) = @_;
1210 or return; 1313
1211 $map->load; 1314 cf::sync_job { $map->load };
1212 $map
1213 }
1214} 1315}
1215 1316
1216sub save { 1317sub save {
1217 my ($self) = @_; 1318 my ($self) = @_;
1218 1319
1320 $self->{last_save} = $cf::RUNTIME;
1321
1322 return unless $self->dirty;
1323
1219 my $save = $self->{path}->save_path; utf8::encode $save; 1324 my $save = $self->{path}->save_path; utf8::encode $save;
1220 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1325 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1221 1326
1222 $self->{last_save} = $cf::RUNTIME;
1223
1224 return unless $self->dirty;
1225
1226 $self->{load_path} = $save; 1327 $self->{load_path} = $save;
1227 1328
1228 return if $self->{deny_save}; 1329 return if $self->{deny_save};
1330
1331 local $self->{last_access} = $self->last_access;#d#
1229 1332
1230 if ($uniq) { 1333 if ($uniq) {
1231 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1232 $self->save_objects ($uniq, cf::IO_UNIQUES); 1335 $self->save_objects ($uniq, cf::IO_UNIQUES);
1233 } else { 1336 } else {
… …
1236} 1339}
1237 1340
1238sub swap_out { 1341sub swap_out {
1239 my ($self) = @_; 1342 my ($self) = @_;
1240 1343
1344 # save first because save cedes
1345 $self->save;
1346
1241 return if $self->players; 1347 return if $self->players;
1242 return if $self->in_memory != cf::MAP_IN_MEMORY; 1348 return if $self->in_memory != cf::MAP_IN_MEMORY;
1243 return if $self->{deny_save}; 1349 return if $self->{deny_save};
1244 1350
1245 $self->save;
1246 $self->clear; 1351 $self->clear;
1247 $self->in_memory (cf::MAP_SWAPPED); 1352 $self->in_memory (cf::MAP_SWAPPED);
1248} 1353}
1249 1354
1250sub reset_at { 1355sub reset_at {
… …
1316 1421
1317sub customise_for { 1422sub customise_for {
1318 my ($map, $ob) = @_; 1423 my ($map, $ob) = @_;
1319 1424
1320 if ($map->per_player) { 1425 if ($map->per_player) {
1321 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1426 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1322 } 1427 }
1323 1428
1324 $map 1429 $map
1325} 1430}
1326 1431
1327sub emergency_save { 1432sub emergency_save {
1328 local $cf::FREEZE = 1; 1433 my $freeze_guard = cf::freeze_mainloop;
1329 1434
1330 warn "enter emergency map save\n"; 1435 warn "enter emergency map save\n";
1331 1436
1332 cf::sync_job { 1437 cf::sync_job {
1333 warn "begin emergency map save\n"; 1438 warn "begin emergency map save\n";
… …
1405=cut 1510=cut
1406 1511
1407sub cf::object::player::enter_link { 1512sub cf::object::player::enter_link {
1408 my ($self) = @_; 1513 my ($self) = @_;
1409 1514
1515 $self->deactivate_recursive;
1516
1410 return if $self->map == $LINK_MAP; 1517 return if $self->map == $LINK_MAP;
1411 1518
1412 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1413 if $self->map; 1520 if $self->map;
1414 1521
1415 $self->enter_map ($LINK_MAP, 20, 20); 1522 $self->enter_map ($LINK_MAP, 20, 20);
1416 $self->deactivate_recursive;
1417} 1523}
1418 1524
1419sub cf::object::player::leave_link { 1525sub cf::object::player::leave_link {
1420 my ($self, $map, $x, $y) = @_; 1526 my ($self, $map, $x, $y) = @_;
1421 1527
1422 my $link_pos = delete $self->{_link_pos}; 1528 my $link_pos = delete $self->{_link_pos};
1423 1529
1424 unless ($map) { 1530 unless ($map) {
1425 # restore original map position 1531 # restore original map position
1426 ($map, $x, $y) = @{ $link_pos || [] }; 1532 ($map, $x, $y) = @{ $link_pos || [] };
1427 $map = cf::map::find_map $map; 1533 $map = cf::map::find $map;
1428 1534
1429 unless ($map) { 1535 unless ($map) {
1430 ($map, $x, $y) = @$EMERGENCY_POSITION; 1536 ($map, $x, $y) = @$EMERGENCY_POSITION;
1431 $map = cf::map::find_map $map 1537 $map = cf::map::find $map
1432 or die "FATAL: cannot load emergency map\n"; 1538 or die "FATAL: cannot load emergency map\n";
1433 } 1539 }
1434 } 1540 }
1435 1541
1436 ($x, $y) = (-1, -1) 1542 ($x, $y) = (-1, -1)
… …
1444 1550
1445 $self->activate_recursive; 1551 $self->activate_recursive;
1446 $self->enter_map ($map, $x, $y); 1552 $self->enter_map ($map, $x, $y);
1447} 1553}
1448 1554
1555cf::player->attach (
1556 on_logout => sub {
1557 my ($pl) = @_;
1558
1559 # abort map switching before logout
1560 if ($pl->ob->{_link_pos}) {
1561 cf::sync_job {
1562 $pl->ob->leave_link
1563 };
1564 }
1565 },
1566 on_login => sub {
1567 my ($pl) = @_;
1568
1569 # try to abort aborted map switching on player login :)
1570 # should happen only on crashes
1571 if ($pl->ob->{_link_pos}) {
1572 $pl->ob->enter_link;
1573 cf::async {
1574 # we need this sleep as the login has a concurrent enter_exit running
1575 # and this sleep increases chances of the player not ending up in scorn
1576 Coro::Timer::sleep 1;
1577 $pl->ob->leave_link;
1578 };
1579 }
1580 },
1581);
1582
1449=item $player_object->goto_map ($map, $x, $y) 1583=item $player_object->goto_map ($path, $x, $y)
1450 1584
1451=cut 1585=cut
1452 1586
1453sub cf::object::player::goto_map { 1587sub cf::object::player::goto_map {
1454 my ($self, $path, $x, $y) = @_; 1588 my ($self, $path, $x, $y) = @_;
1455 1589
1456 $self->enter_link; 1590 $self->enter_link;
1457 1591
1458 (Coro::async { 1592 (cf::async {
1459 $path = new cf::path $path; 1593 $path = new cf::path $path;
1460 1594
1461 my $map = cf::map::find_map $path->as_string; 1595 my $map = cf::map::find $path->as_string;
1462 $map = $map->customise_for ($self) if $map; 1596 $map = $map->customise_for ($self) if $map;
1463 1597
1464 warn "entering ", $map->path, " at ($x, $y)\n" 1598# warn "entering ", $map->path, " at ($x, $y)\n"
1465 if $map; 1599# if $map;
1466 1600
1467 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1601 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1468 1602
1469 $self->leave_link ($map, $x, $y); 1603 $self->leave_link ($map, $x, $y);
1470 })->prio (1); 1604 })->prio (1);
… …
1525 1659
1526 return unless $self->type == cf::PLAYER; 1660 return unless $self->type == cf::PLAYER;
1527 1661
1528 $self->enter_link; 1662 $self->enter_link;
1529 1663
1530 (Coro::async { 1664 (cf::async {
1665 $self->deactivate_recursive; # just to be sure
1531 unless (eval { 1666 unless (eval {
1532
1533 prepare_random_map $exit 1667 prepare_random_map $exit
1534 if $exit->slaying eq "/!"; 1668 if $exit->slaying eq "/!";
1535 1669
1536 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1670 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1537 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1599 on_reply => sub { 1733 on_reply => sub {
1600 my ($ns, $msg) = @_; 1734 my ($ns, $msg) = @_;
1601 1735
1602 # this weird shuffling is so that direct followup queries 1736 # this weird shuffling is so that direct followup queries
1603 # get handled first 1737 # get handled first
1604 my $queue = delete $ns->{query_queue}; 1738 my $queue = delete $ns->{query_queue}
1739 or return; # be conservative, not sure how that can happen, but we saw a crash here
1605 1740
1606 (shift @$queue)->[1]->($msg); 1741 (shift @$queue)->[1]->($msg);
1607 1742
1608 push @{ $ns->{query_queue} }, @$queue; 1743 push @{ $ns->{query_queue} }, @$queue;
1609 1744
… …
1626=cut 1761=cut
1627 1762
1628sub cf::client::coro { 1763sub cf::client::coro {
1629 my ($self, $cb) = @_; 1764 my ($self, $cb) = @_;
1630 1765
1631 my $coro; $coro = async { 1766 my $coro = &cf::async ($cb);
1632 eval {
1633 $cb->();
1634 };
1635 warn $@ if $@;
1636 };
1637 1767
1638 $coro->on_destroy (sub { 1768 $coro->on_destroy (sub {
1639 delete $self->{_coro}{$coro+0}; 1769 delete $self->{_coro}{$coro+0};
1640 }); 1770 });
1641 1771
… …
1813 1943
1814{ 1944{
1815 my $path = cf::localdir . "/database.pst"; 1945 my $path = cf::localdir . "/database.pst";
1816 1946
1817 sub db_load() { 1947 sub db_load() {
1818 warn "loading database $path\n";#d# remove later
1819 $DB = stat $path ? Storable::retrieve $path : { }; 1948 $DB = stat $path ? Storable::retrieve $path : { };
1820 } 1949 }
1821 1950
1822 my $pid; 1951 my $pid;
1823 1952
1824 sub db_save() { 1953 sub db_save() {
1825 warn "saving database $path\n";#d# remove later
1826 waitpid $pid, 0 if $pid; 1954 waitpid $pid, 0 if $pid;
1827 if (0 == ($pid = fork)) { 1955 if (0 == ($pid = fork)) {
1828 $DB->{_meta}{version} = 1; 1956 $DB->{_meta}{version} = 1;
1829 Storable::nstore $DB, "$path~"; 1957 Storable::nstore $DB, "$path~";
1830 rename "$path~", $path; 1958 rename "$path~", $path;
… …
1878 open my $fh, "<:utf8", cf::confdir . "/config" 2006 open my $fh, "<:utf8", cf::confdir . "/config"
1879 or return; 2007 or return;
1880 2008
1881 local $/; 2009 local $/;
1882 *CFG = YAML::Syck::Load <$fh>; 2010 *CFG = YAML::Syck::Load <$fh>;
2011
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013
2014 if (exists $CFG{mlockall}) {
2015 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall
2017 and die "WARNING: m(un)lockall failed: $!\n";
2018 };
2019 warn $@ if $@;
2020 }
1883} 2021}
1884 2022
1885sub main { 2023sub main {
1886 # we must not ever block the main coroutine 2024 # we must not ever block the main coroutine
1887 local $Coro::idle = sub { 2025 local $Coro::idle = sub {
… …
1907 return; 2045 return;
1908 } 2046 }
1909 2047
1910 warn "reloading..."; 2048 warn "reloading...";
1911 2049
1912 local $FREEZE = 1; 2050 my $guard = freeze_mainloop;
1913 cf::emergency_save; 2051 cf::emergency_save;
1914 2052
1915 eval { 2053 eval {
1916 # if anything goes wrong in here, we should simply crash as we already saved 2054 # if anything goes wrong in here, we should simply crash as we already saved
1917 2055
… …
2053 reentrant => 0, 2191 reentrant => 0,
2054 prio => 0, 2192 prio => 0,
2055 at => $NEXT_TICK || $TICK, 2193 at => $NEXT_TICK || $TICK,
2056 data => WF_AUTOCANCEL, 2194 data => WF_AUTOCANCEL,
2057 cb => sub { 2195 cb => sub {
2058 unless ($FREEZE) {
2059 cf::server_tick; # one server iteration 2196 cf::server_tick; # one server iteration
2060 $RUNTIME += $TICK; 2197 $RUNTIME += $TICK;
2061 }
2062
2063 $NEXT_TICK += $TICK; 2198 $NEXT_TICK += $TICK;
2064 2199
2065 # if we are delayed by four ticks or more, skip them all 2200 # if we are delayed by four ticks or more, skip them all
2066 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2067 2202
… …
2090 or warn "ERROR: unable to write runtime file: $!"; 2225 or warn "ERROR: unable to write runtime file: $!";
2091 })->(); 2226 })->();
2092 }, 2227 },
2093); 2228);
2094 2229
2230END { cf::emergency_save }
2231
20951 22321
2096 2233

Diff Legend

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