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.114 by root, Mon Jan 1 16:00:10 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_access ($cf::RUNTIME); 1242 $map->{last_save} = $cf::RUNTIME;
1243
1244 Coro::cede;
1149 1245
1150 if ($map->should_reset) { 1246 if ($map->should_reset) {
1151 $map->reset; 1247 $map->reset;
1248 undef $guard;
1152 $map = find_map $path; 1249 $map = find $path
1250 or return;
1153 } 1251 }
1154 1252
1155 $cf::MAP{$key} = $map 1253 $cf::MAP{$key} = $map
1156 } 1254 }
1157} 1255}
1158 1256
1159sub load { 1257sub load {
1160 my ($self) = @_; 1258 my ($self) = @_;
1161 1259
1260 my $path = $self->{path};
1261 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1262
1162 return if $self->in_memory != cf::MAP_SWAPPED; 1263 return if $self->in_memory != cf::MAP_SWAPPED;
1163 1264
1164 $self->in_memory (cf::MAP_LOADING); 1265 $self->in_memory (cf::MAP_LOADING);
1165
1166 my $path = $self->{path};
1167 1266
1168 $self->alloc; 1267 $self->alloc;
1169 $self->load_objects ($self->{load_path}, 1) 1268 $self->load_objects ($self->{load_path}, 1)
1170 or return; 1269 or return;
1171 1270
… …
1177 if (aio_open $uniq, O_RDONLY, 0) { 1276 if (aio_open $uniq, O_RDONLY, 0) {
1178 $self->clear_unique_items; 1277 $self->clear_unique_items;
1179 $self->load_objects ($uniq, 0); 1278 $self->load_objects ($uniq, 0);
1180 } 1279 }
1181 } 1280 }
1281
1282 Coro::cede;
1182 1283
1183 # now do the right thing for maps 1284 # now do the right thing for maps
1184 $self->link_multipart_objects; 1285 $self->link_multipart_objects;
1185 1286
1186 if ($self->{path}->is_style_map) { 1287 if ($self->{path}->is_style_map) {
… …
1194 $self->difficulty ($self->estimate_difficulty) 1295 $self->difficulty ($self->estimate_difficulty)
1195 unless $self->difficulty; 1296 unless $self->difficulty;
1196 $self->activate; 1297 $self->activate;
1197 } 1298 }
1198 1299
1300 Coro::cede;
1301
1199 $self->in_memory (cf::MAP_IN_MEMORY); 1302 $self->in_memory (cf::MAP_IN_MEMORY);
1200} 1303}
1201 1304
1202sub load_map_sync { 1305sub find_sync {
1203 my ($path, $origin) = @_; 1306 my ($path, $origin) = @_;
1204 1307
1205 #warn "load_map_sync<$path, $origin>\n";#d# 1308 cf::sync_job { cf::map::find $path, $origin }
1309}
1206 1310
1207 cf::sync_job { 1311sub do_load_sync {
1208 my $map = cf::map::find_map $path, $origin 1312 my ($map) = @_;
1209 or return; 1313
1210 $map->load; 1314 cf::sync_job { $map->load };
1211 $map
1212 }
1213} 1315}
1214 1316
1215sub save { 1317sub save {
1216 my ($self) = @_; 1318 my ($self) = @_;
1217 1319
1320 $self->{last_save} = $cf::RUNTIME;
1321
1322 return unless $self->dirty;
1323
1218 my $save = $self->{path}->save_path; utf8::encode $save; 1324 my $save = $self->{path}->save_path; utf8::encode $save;
1219 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1325 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1220 1326
1221 $self->{last_save} = $cf::RUNTIME;
1222
1223 return unless $self->dirty;
1224
1225 $self->{load_path} = $save; 1327 $self->{load_path} = $save;
1226 1328
1227 return if $self->{deny_save}; 1329 return if $self->{deny_save};
1330
1331 local $self->{last_access} = $self->last_access;#d#
1228 1332
1229 if ($uniq) { 1333 if ($uniq) {
1230 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1231 $self->save_objects ($uniq, cf::IO_UNIQUES); 1335 $self->save_objects ($uniq, cf::IO_UNIQUES);
1232 } else { 1336 } else {
… …
1235} 1339}
1236 1340
1237sub swap_out { 1341sub swap_out {
1238 my ($self) = @_; 1342 my ($self) = @_;
1239 1343
1344 # save first because save cedes
1345 $self->save;
1346
1240 return if $self->players; 1347 return if $self->players;
1241 return if $self->in_memory != cf::MAP_IN_MEMORY; 1348 return if $self->in_memory != cf::MAP_IN_MEMORY;
1242 return if $self->{deny_save}; 1349 return if $self->{deny_save};
1243 1350
1244 $self->save;
1245 $self->clear; 1351 $self->clear;
1246 $self->in_memory (cf::MAP_SWAPPED); 1352 $self->in_memory (cf::MAP_SWAPPED);
1247} 1353}
1248 1354
1249sub reset_at { 1355sub reset_at {
… …
1315 1421
1316sub customise_for { 1422sub customise_for {
1317 my ($map, $ob) = @_; 1423 my ($map, $ob) = @_;
1318 1424
1319 if ($map->per_player) { 1425 if ($map->per_player) {
1320 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1426 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1321 } 1427 }
1322 1428
1323 $map 1429 $map
1324} 1430}
1325 1431
1326sub emergency_save { 1432sub emergency_save {
1327 local $cf::FREEZE = 1; 1433 my $freeze_guard = cf::freeze_mainloop;
1328 1434
1329 warn "enter emergency map save\n"; 1435 warn "enter emergency map save\n";
1330 1436
1331 cf::sync_job { 1437 cf::sync_job {
1332 warn "begin emergency map save\n"; 1438 warn "begin emergency map save\n";
… …
1383 (ref $cf::CFG{"may_$access"} 1489 (ref $cf::CFG{"may_$access"}
1384 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1490 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1385 : $cf::CFG{"may_$access"}) 1491 : $cf::CFG{"may_$access"})
1386} 1492}
1387 1493
1494=item $player_object->enter_link
1495
1496Freezes the player and moves him/her to a special map (C<{link}>).
1497
1498The player should be reaosnably safe there for short amounts of time. You
1499I<MUST> call C<leave_link> as soon as possible, though.
1500
1501=item $player_object->leave_link ($map, $x, $y)
1502
1503Moves the player out of the specila link map onto the given map. If the
1504map is not valid (or omitted), the player will be moved back to the
1505location he/she was before the call to C<enter_link>, or, if that fails,
1506to the emergency map position.
1507
1508Might block.
1509
1510=cut
1511
1388sub cf::object::player::enter_link { 1512sub cf::object::player::enter_link {
1389 my ($self) = @_; 1513 my ($self) = @_;
1390 1514
1515 $self->deactivate_recursive;
1516
1391 return if $self->map == $LINK_MAP; 1517 return if $self->map == $LINK_MAP;
1392 1518
1393 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1394 if $self->map; 1520 if $self->map;
1395 1521
1396 $self->enter_map ($LINK_MAP, 20, 20); 1522 $self->enter_map ($LINK_MAP, 20, 20);
1397 $self->deactivate_recursive;
1398} 1523}
1399 1524
1400sub cf::object::player::leave_link { 1525sub cf::object::player::leave_link {
1401 my ($self, $map, $x, $y) = @_; 1526 my ($self, $map, $x, $y) = @_;
1402 1527
1403 my $link_pos = delete $self->{_link_pos}; 1528 my $link_pos = delete $self->{_link_pos};
1404 1529
1405 unless ($map) { 1530 unless ($map) {
1406 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1407
1408 # restore original map position 1531 # restore original map position
1409 ($map, $x, $y) = @{ $link_pos || [] }; 1532 ($map, $x, $y) = @{ $link_pos || [] };
1410 $map = cf::map::find_map $map; 1533 $map = cf::map::find $map;
1411 1534
1412 unless ($map) { 1535 unless ($map) {
1413 ($map, $x, $y) = @$EMERGENCY_POSITION; 1536 ($map, $x, $y) = @$EMERGENCY_POSITION;
1414 $map = cf::map::find_map $map 1537 $map = cf::map::find $map
1415 or die "FATAL: cannot load emergency map\n"; 1538 or die "FATAL: cannot load emergency map\n";
1416 } 1539 }
1417 } 1540 }
1418 1541
1419 ($x, $y) = (-1, -1) 1542 ($x, $y) = (-1, -1)
… …
1427 1550
1428 $self->activate_recursive; 1551 $self->activate_recursive;
1429 $self->enter_map ($map, $x, $y); 1552 $self->enter_map ($map, $x, $y);
1430} 1553}
1431 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
1432=item $player_object->goto_map ($map, $x, $y) 1583=item $player_object->goto_map ($path, $x, $y)
1433 1584
1434=cut 1585=cut
1435 1586
1436sub cf::object::player::goto_map { 1587sub cf::object::player::goto_map {
1437 my ($self, $path, $x, $y) = @_; 1588 my ($self, $path, $x, $y) = @_;
1438 1589
1439 $self->enter_link; 1590 $self->enter_link;
1440 1591
1441 (Coro::async { 1592 (cf::async {
1442 $path = new cf::path $path; 1593 $path = new cf::path $path;
1443 1594
1444 my $map = cf::map::find_map $path->as_string; 1595 my $map = cf::map::find $path->as_string;
1445 $map = $map->customise_for ($self) if $map; 1596 $map = $map->customise_for ($self) if $map;
1446 1597
1447 warn "entering ", $map->path, " at ($x, $y)\n" 1598# warn "entering ", $map->path, " at ($x, $y)\n"
1448 if $map; 1599# if $map;
1600
1601 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1449 1602
1450 $self->leave_link ($map, $x, $y); 1603 $self->leave_link ($map, $x, $y);
1451 })->prio (1); 1604 })->prio (1);
1452} 1605}
1453 1606
… …
1506 1659
1507 return unless $self->type == cf::PLAYER; 1660 return unless $self->type == cf::PLAYER;
1508 1661
1509 $self->enter_link; 1662 $self->enter_link;
1510 1663
1511 (Coro::async { 1664 (cf::async {
1665 $self->deactivate_recursive; # just to be sure
1512 unless (eval { 1666 unless (eval {
1513
1514 prepare_random_map $exit 1667 prepare_random_map $exit
1515 if $exit->slaying eq "/!"; 1668 if $exit->slaying eq "/!";
1516 1669
1517 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;
1518 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1580 on_reply => sub { 1733 on_reply => sub {
1581 my ($ns, $msg) = @_; 1734 my ($ns, $msg) = @_;
1582 1735
1583 # this weird shuffling is so that direct followup queries 1736 # this weird shuffling is so that direct followup queries
1584 # get handled first 1737 # get handled first
1585 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
1586 1740
1587 (shift @$queue)->[1]->($msg); 1741 (shift @$queue)->[1]->($msg);
1588 1742
1589 push @{ $ns->{query_queue} }, @$queue; 1743 push @{ $ns->{query_queue} }, @$queue;
1590 1744
… …
1607=cut 1761=cut
1608 1762
1609sub cf::client::coro { 1763sub cf::client::coro {
1610 my ($self, $cb) = @_; 1764 my ($self, $cb) = @_;
1611 1765
1612 my $coro; $coro = async { 1766 my $coro = &cf::async ($cb);
1613 eval {
1614 $cb->();
1615 };
1616 warn $@ if $@;
1617 };
1618 1767
1619 $coro->on_destroy (sub { 1768 $coro->on_destroy (sub {
1620 delete $self->{_coro}{$coro+0}; 1769 delete $self->{_coro}{$coro+0};
1621 }); 1770 });
1622 1771
… …
1794 1943
1795{ 1944{
1796 my $path = cf::localdir . "/database.pst"; 1945 my $path = cf::localdir . "/database.pst";
1797 1946
1798 sub db_load() { 1947 sub db_load() {
1799 warn "loading database $path\n";#d# remove later
1800 $DB = stat $path ? Storable::retrieve $path : { }; 1948 $DB = stat $path ? Storable::retrieve $path : { };
1801 } 1949 }
1802 1950
1803 my $pid; 1951 my $pid;
1804 1952
1805 sub db_save() { 1953 sub db_save() {
1806 warn "saving database $path\n";#d# remove later
1807 waitpid $pid, 0 if $pid; 1954 waitpid $pid, 0 if $pid;
1808 if (0 == ($pid = fork)) { 1955 if (0 == ($pid = fork)) {
1809 $DB->{_meta}{version} = 1; 1956 $DB->{_meta}{version} = 1;
1810 Storable::nstore $DB, "$path~"; 1957 Storable::nstore $DB, "$path~";
1811 rename "$path~", $path; 1958 rename "$path~", $path;
… …
1859 open my $fh, "<:utf8", cf::confdir . "/config" 2006 open my $fh, "<:utf8", cf::confdir . "/config"
1860 or return; 2007 or return;
1861 2008
1862 local $/; 2009 local $/;
1863 *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 }
1864} 2021}
1865 2022
1866sub main { 2023sub main {
1867 # we must not ever block the main coroutine 2024 # we must not ever block the main coroutine
1868 local $Coro::idle = sub { 2025 local $Coro::idle = sub {
1869 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2026 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1870 (Coro::unblock_sub { 2027 (Coro::unblock_sub {
1871 Event::one_event; 2028 Event::one_event;
1872 })->(); 2029 })->();
1873 }; 2030 };
1874 2031
… …
1888 return; 2045 return;
1889 } 2046 }
1890 2047
1891 warn "reloading..."; 2048 warn "reloading...";
1892 2049
1893 local $FREEZE = 1; 2050 my $guard = freeze_mainloop;
1894 cf::emergency_save; 2051 cf::emergency_save;
1895 2052
1896 eval { 2053 eval {
1897 # 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
1898 2055
… …
2034 reentrant => 0, 2191 reentrant => 0,
2035 prio => 0, 2192 prio => 0,
2036 at => $NEXT_TICK || $TICK, 2193 at => $NEXT_TICK || $TICK,
2037 data => WF_AUTOCANCEL, 2194 data => WF_AUTOCANCEL,
2038 cb => sub { 2195 cb => sub {
2039 unless ($FREEZE) {
2040 cf::server_tick; # one server iteration 2196 cf::server_tick; # one server iteration
2041 $RUNTIME += $TICK; 2197 $RUNTIME += $TICK;
2042 }
2043
2044 $NEXT_TICK += $TICK; 2198 $NEXT_TICK += $TICK;
2045 2199
2046 # 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
2047 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2048 2202
… …
2071 or warn "ERROR: unable to write runtime file: $!"; 2225 or warn "ERROR: unable to write runtime file: $!";
2072 })->(); 2226 })->();
2073 }, 2227 },
2074); 2228);
2075 2229
2230END { cf::emergency_save }
2231
20761 22321
2077 2233

Diff Legend

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