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.509 by root, Mon Apr 5 03:22:25 2010 UTC vs.
Revision 1.533 by root, Thu Apr 29 07:59:17 2010 UTC

… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
112 118
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
242 252
243=back 253=back
244 254
245=cut 255=cut
246 256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
247$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 264 my $msg = join "", @_;
249 265
250 $msg .= "\n" 266 $msg .= "\n"
251 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
252 268
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 270
255 LOG llevError, $msg; 271 LOG llevWarn, $msg;
256}; 272};
257 273
258$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
260 276
261 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
262 278
263 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 281 return;#d#
266 }#d# 282 }#d#
267 283
268 # kill coroutine otherwise 284 # kill coroutine otherwise
269 Coro::terminate 285 Coro::terminate
… …
396} 412}
397 413
398=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
399 415
400Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 417get spread over time.
402 418
403=cut 419=cut
404 420
405sub periodic($$) { 421sub periodic($$) {
406 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
… …
503 519
504sub sync_job(&) { 520sub sync_job(&) {
505 my ($job) = @_; 521 my ($job) = @_;
506 522
507 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::main) {
508 my $time = EV::time; 524 my $time = AE::time;
509 525
510 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
512 528
513 LOG llevError, Carp::longmess "sync job";#d# 529 LOG llevError, Carp::longmess "sync job";#d#
… …
518 my @res; 534 my @res;
519 535
520 (async { 536 (async {
521 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 538 @res = eval { $job->() };
523 warn $@ if $@; 539 error $@ if $@;
524 undef $busy; 540 undef $busy;
525 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
526 542
527 while ($busy) { 543 while ($busy) {
528 if (Coro::nready) { 544 if (Coro::nready) {
… …
530 } else { 546 } else {
531 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
532 } 548 }
533 } 549 }
534 550
535 my $time = EV::time - $time; 551 my $time = AE::time - $time;
536 552
537 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
538 554
539 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
540 } else { 556 } else {
… …
584 reset_signals; 600 reset_signals;
585 &$cb 601 &$cb
586 }, @args; 602 }, @args;
587 603
588 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
589} 616}
590 617
591=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
592 619
593=cut 620=cut
… …
728 755
729 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 757 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
732 759
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 761
735 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
738 765
… …
748 775
749=cut 776=cut
750 777
751sub datalog($@) { 778sub datalog($@) {
752 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 781}
755 782
756=back 783=back
757 784
758=cut 785=cut
… …
953 980
954 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 983
957 } elsif (ref $type) { 984 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
959 986
960 } else { 987 } else {
961 shift @arg; 988 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
963 } 990 }
964 } 991 }
965} 992}
966 993
967sub _object_attach { 994sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
978 } 1005 }
979 1006
980 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
981 } else { 1008 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1010 }
984 1011
985 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
986} 1013}
987 1014
… …
1046 1073
1047 for (@$callbacks) { 1074 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1049 1076
1050 if ($@) { 1077 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1079 override;
1054 } 1080 }
1055 1081
1056 return 1 if $override; 1082 return 1 if $override;
1057 } 1083 }
… …
1136 for (@$attach) { 1162 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1139 } 1165 }
1140 } else { 1166 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1168 }
1143 } 1169 }
1144} 1170}
1145 1171
1146cf::attachable->attach ( 1172cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1174 1200
1175 sync_job { 1201 sync_job {
1176 if (length $$rdata) { 1202 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1180 1207
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1211 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1207 1234
1208 $filename =~ s%/[^/]+$%%; 1235 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1236 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1237 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1212 } 1239 }
1213 } else { 1240 } else {
1214 aio_unlink $filename; 1241 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1216 } 1243 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1268 $av = $st->{objs};
1242 } 1269 }
1243 1270
1244 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1247 1275
1248 ($data, $av) 1276 ($data, $av)
1249} 1277}
1250 1278
1251=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
… …
1343 1371
1344 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1373 if $reply;
1346 1374
1347 } else { 1375 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1377 }
1350 1378
1351 cf::override; 1379 cf::override;
1352 }, 1380 },
1353); 1381);
… …
1364 1392
1365 $grp 1393 $grp
1366} 1394}
1367 1395
1368sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1369 cf::sync_job { 1399 cf::sync_job {
1370 my %todo; 1400 my %todo;
1371 1401
1372 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1403 next unless -r $path;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1444 next ext
1415 unless exists $done{$_}; 1445 unless exists $done{$_};
1416 } 1446 }
1417 1447
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1449
1420 my $active = eval $v->{source}; 1450 my $active = eval $v->{source};
1421 1451
1422 if (length $@) { 1452 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1453 error "$v->{path}: $@\n";
1424 1454
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1456 if exists $v->{meta}{mandatory};
1457
1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1459 delete $todo{$k};
1427 } else { 1460 } else {
1428 $done{$k} = delete $todo{$k}; 1461 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1462 push @EXTS, $v->{pkg};
1430 $progress = 1; 1463 $progress = 1;
1431 1464
1432 warn "$v->{base}: extension inactive.\n" 1465 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1466 unless $active;
1434 } 1467 }
1435 } 1468 }
1436 1469
1437 unless ($progress) { 1470 unless ($progress) {
… …
1533 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1534 } 1567 }
1535 } 1568 }
1536} 1569}
1537 1570
1571cf::player->attach (
1572 on_load => sub {
1573 my ($pl, $path) = @_;
1574
1575 # restore slots saved in save, below
1576 my $slots = delete $pl->{_slots};
1577
1578 $pl->ob->current_weapon ($slots->[0]);
1579 $pl->combat_ob ($slots->[1]);
1580 $pl->ranged_ob ($slots->[2]);
1581 },
1582);
1583
1538sub save($) { 1584sub save($) {
1539 my ($pl) = @_; 1585 my ($pl) = @_;
1540 1586
1541 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1542 1588
… …
1547 1593
1548 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1550 1596
1551 cf::get_slot 0.01; 1597 cf::get_slot 0.01;
1598
1599 # save slots, to be restored later
1600 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1601
1553 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1603 cf::cede_to_tick;
1555} 1604}
1556 1605
… …
1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1594 1643
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1596 $pl->deactivate; 1645 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1600 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1601 1649
1602 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1658 \@logins 1706 \@logins
1659} 1707}
1660 1708
1661=item $player->maps 1709=item $player->maps
1662 1710
1711=item cf::player::maps $login
1712
1663Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1664player. May block. 1714player. May block.
1665 1715
1666=cut 1716=cut
1667 1717
… …
1728 1778
1729=cut 1779=cut
1730 1780
1731sub find_by_path($) { 1781sub find_by_path($) {
1732 my ($path) = @_; 1782 my ($path) = @_;
1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1733 1785
1734 my ($match, $specificity); 1786 my ($match, $specificity);
1735 1787
1736 for my $region (list) { 1788 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
… …
1801 1853
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1855}
1804 1856
1805# also paths starting with '/' 1857# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1859
1808sub thawer_merge { 1860sub thawer_merge {
1809 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1810 1862
1811 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
2121 or next; 2173 or next;
2122 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2123 or next; 2175 or next;
2124 $neigh->load; 2176 $neigh->load;
2125 2177
2178 # now find the diagonal neighbours
2126 push @neigh, 2179 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 } 2182 }
2130 2183
… …
2182 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2183 2236
2184 () 2237 ()
2185} 2238}
2186 2239
2240# common code, used by both ->save and ->swapout
2187sub save { 2241sub _save {
2188 my ($self) = @_; 2242 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2243
2192 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2193 2245
2194 return unless $self->dirty; 2246 return unless $self->dirty;
2195 2247
… …
2215 } else { 2267 } else {
2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217 } 2269 }
2218} 2270}
2219 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2220sub swap_out { 2280sub swap_out {
2221 my ($self) = @_; 2281 my ($self) = @_;
2222 2282
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2284
2228 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2230 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2231 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->in_memory (cf::MAP_SWAPPED); 2292 $self->in_memory (cf::MAP_SWAPPED);
2293
2294 # then atomically save
2295 $self->_save;
2296
2297 # then free the map
2298 $self->clear;
2299}
2300
2301sub reset_at {
2302 my ($self) = @_;
2303
2304 # TODO: safety, remove and allow resettable per-player maps
2305 return 1e99 if $self->{deny_reset};
2306
2307 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2308 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2309
2310 $time + $to
2311}
2312
2313sub should_reset {
2314 my ($self) = @_;
2315
2316 $self->reset_at <= $cf::RUNTIME
2317}
2318
2319sub reset {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 return if $self->players;
2325
2326 cf::trace "resetting map ", $self->path, "\n";
2327
2328 $self->in_memory (cf::MAP_SWAPPED);
2329
2330 # need to save uniques path
2331 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333
2334 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2335 if $uniq;
2336 }
2337
2338 delete $cf::MAP{$self->path};
2233 2339
2234 $self->deactivate; 2340 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2342 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2343
2282 $self->unlink_save; 2344 $self->unlink_save;
2283 $self->destroy; 2345 $self->destroy;
2284} 2346}
2285 2347
… …
2293 2355
2294 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2295 2357
2296 $self->unlink_save; 2358 $self->unlink_save;
2297 2359
2298 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2365
… …
2533 2595
2534Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2535 2597
2536The player should be reasonably safe there for short amounts of time (e.g. 2598The player should be reasonably safe there for short amounts of time (e.g.
2537for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2599for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link 2600though, as the player cannot control the character while it is on the link
2539map. 2601map.
2540 2602
2541Will never block. 2603Will never block.
2542 2604
2543=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2565 my ($self) = @_; 2627 my ($self) = @_;
2566 2628
2567 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2568 2630
2631 ++$self->{_link_recursion};
2632
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2634
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2573 2637
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2639}
2576 2640
2577sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2579 2643
… …
2604 $map->load_neighbours; 2668 $map->load_neighbours;
2605 2669
2606 return unless $self->contr->active; 2670 return unless $self->contr->active;
2607 2671
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2610 2674 # entering was successful
2675 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2676 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2677 $self->activate_recursive;
2613} 2678 }
2614 2679
2680}
2681
2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616 2683
2617Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2618her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2619that has to return the map if sucecssful, and then unfreezes the player on 2686that has to return the map if sucecssful, and then unfreezes the player on
2620the new (success) or old (failed) map position. In either case, $done will 2687the new (success) or old (failed) map position. In either case, $done will
… …
2627 2694
2628our $GOTOGEN; 2695our $GOTOGEN;
2629 2696
2630sub cf::object::player::goto { 2697sub cf::object::player::goto {
2631 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2632 2705
2633 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2708
2636 $self->enter_link; 2709 $self->enter_link;
… …
2660 my $map = eval { 2733 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2662 2735
2663 if ($map) { 2736 if ($map) {
2664 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2739 } else {
2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668 } 2741 }
2669 2742
2670 $map 2743 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2681 } 2754 }
2682 2755
2683 $done->() if $done; 2756 $done->($self) if $done;
2684 })->prio (1); 2757 })->prio (1);
2685} 2758}
2686 2759
2687=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2688 2761
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2783 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2785 2858
2786 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 2860 $self->leave_link;
2788 } 2861 }
2789 })->prio (1); 2862 })->prio (1);
2790} 2863}
2791 2864
… …
3104 3177
3105 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
3106 if $reply; 3179 if $reply;
3107 3180
3108 } else { 3181 } else {
3109 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3110 } 3183 }
3111 3184
3112 cf::override; 3185 cf::override;
3113 }, 3186 },
3114); 3187);
… …
3244 local @cf::_safe_eval_args = values %vars; 3317 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3318 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3319 }
3247 3320
3248 if ($@) { 3321 if ($@) {
3249 warn "$@"; 3322 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3252 } 3325 }
3253 3326
3254 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3255} 3328}
3256 3329
… …
3290 # for this (global event?) 3363 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3365
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3367
3295 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3296 3369
3297 my $facedata; 3370 my $facedata;
3298 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3299 or die "$path: $!"; 3372 or die "$path: $!";
3300 3373
… …
3334 3407
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3411 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3413 }
3341 3414
3342 cf::cede_to_tick; 3415 cf::cede_to_tick;
3343 } 3416 }
3344 } 3417 }
… …
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3436
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3366 } else { 3439 } else {
3367 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3368 } 3441 }
3369 3442
3370 cf::cede_to_tick; 3443 cf::cede_to_tick;
3371 } 3444 }
3372 } 3445 }
3373 3446
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3448
3376 1 3449 1
3377} 3450}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3451
3399register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3401 3454
3402 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
… …
3441sub reload_treasures { 3494sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3444} 3497}
3445 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3446sub reload_resources { 3522sub reload_resources {
3447 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3448 3524
3449 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3450 reload_archetypes; 3527 reload_archetypes;
3451 reload_regions; 3528 reload_regions;
3452 reload_treasures; 3529 reload_treasures;
3453 3530
3454 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3455} 3532}
3456 3533
3457sub reload_config { 3534sub reload_config {
3458 warn "reloading config file...\n"; 3535 trace "reloading config file...\n";
3459 3536
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3461 or return; 3538 or return;
3462 3539
3463 local $/; 3540 local $/;
3464 *CFG = YAML::XS::Load scalar <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3465 3542
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3544
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3547
3471 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
… …
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3552 };
3476 warn $@ if $@; 3553 warn $@ if $@;
3477 } 3554 }
3478 3555
3479 warn "finished reloading resource files\n"; 3556 trace "finished reloading resource files\n";
3480} 3557}
3481 3558
3482sub pidfile() { 3559sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3561 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3574 seek $fh, 0, 0;
3498 print $fh $$; 3575 print $fh $$;
3499} 3576}
3500 3577
3501sub main_loop { 3578sub main_loop {
3502 warn "EV::loop starting\n"; 3579 trace "EV::loop starting\n";
3503 if (1) { 3580 if (1) {
3504 EV::loop; 3581 EV::loop;
3505 } 3582 }
3506 warn "EV::loop returned\n"; 3583 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3584 goto &main_loop unless $REALLY_UNLOOP;
3508} 3585}
3509 3586
3510sub main { 3587sub main {
3511 cf::init_globals; # initialise logging 3588 cf::init_globals; # initialise logging
3512 3589
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522 3594
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3596
3525 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
… …
3532 }; 3604 };
3533 3605
3534 evthread_start IO::AIO::poll_fileno; 3606 evthread_start IO::AIO::poll_fileno;
3535 3607
3536 cf::sync_job { 3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3537 cf::load_settings; 3614 cf::load_settings;
3538 cf::load_materials; 3615 cf::load_materials;
3539 3616
3540 reload_resources; 3617 reload_resources;
3541 reload_config; 3618 reload_config;
3542 db_init; 3619 db_init;
3543 3620
3544 cf::init_uuid; 3621 cf::init_uuid;
3545 cf::init_signals; 3622 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3623 cf::init_skills;
3548 3624
3549 cf::init_beforeplay; 3625 cf::init_beforeplay;
3550 3626
3551 atomic; 3627 atomic;
… …
3558 use POSIX (); 3634 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560 3636
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3637 (pop @POST_INIT)->(0) while @POST_INIT;
3562 }; 3638 };
3639
3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3563 3642
3564 main_loop; 3643 main_loop;
3565} 3644}
3566 3645
3567############################################################################# 3646#############################################################################
… …
3569 3648
3570# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3571BEGIN { 3650BEGIN {
3572 our %SIGWATCHER = (); 3651 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3576 }; 3655 };
3577 } 3656 }
3578} 3657}
3579 3658
3580sub write_runtime_sync { 3659sub write_runtime_sync {
3581 my $t0 = EV::time; 3660 my $t0 = AE::time;
3582 3661
3583 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3585 3664
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3687 or return;
3609 3688
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3690 and return;
3612 3691
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3693
3615 1 3694 1
3616} 3695}
3617 3696
3618our $uuid_lock; 3697our $uuid_lock;
… …
3630 or return; 3709 or return;
3631 3710
3632 my $value = uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3633 3712
3634 unless ($value) { 3713 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n"; 3714 info "cowardly refusing to write zero uuid value!\n";
3636 return; 3715 return;
3637 } 3716 }
3638 3717
3639 my $value = uuid_str $value + $uuid_skip; 3718 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0; 3719 $uuid_skip = 0;
… …
3650 or return; 3729 or return;
3651 3730
3652 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3653 and return; 3732 and return;
3654 3733
3655 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3656 3735
3657 1 3736 1
3658 3737
3659} 3738}
3660 3739
… …
3666} 3745}
3667 3746
3668sub emergency_save() { 3747sub emergency_save() {
3669 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3670 3749
3671 warn "emergency_perl_save: enter\n"; 3750 info "emergency_perl_save: enter\n";
3672 3751
3673 cf::sync_job { 3752 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so 3753 # this is a trade-off: we want to be very quick here, so
3675 # save all maps without fsync, and later call a global sync 3754 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow) 3755 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0; 3756 local $USE_FSYNC = 0;
3678 3757
3679 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3680 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3681 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3682 warn "emergency_perl_save: begin player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3683 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3684 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3685 $pl->valid or next; 3764 $pl->valid or next;
3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687 $pl->save; 3766 $pl->save;
3688 } 3767 }
3689 warn "emergency_perl_save: end player save\n"; 3768 info "emergency_perl_save: end player save\n";
3690 3769
3691 warn "emergency_perl_save: begin map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3692 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3693 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3694 $map->valid or next; 3773 $map->valid or next;
3695 $map->save; 3774 $map->save;
3696 } 3775 }
3697 warn "emergency_perl_save: end map save\n"; 3776 info "emergency_perl_save: end map save\n";
3698 3777
3699 warn "emergency_perl_save: begin database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3700 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3701 warn "emergency_perl_save: end database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3702 3781
3703 warn "emergency_perl_save: begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1; 3783 write_uuid_sync 1;
3705 warn "emergency_perl_save: end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3706 }; 3785 };
3707 3786
3708 warn "emergency_perl_save: starting sync()\n"; 3787 info "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub { 3788 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n"; 3789 info "emergency_perl_save: finished sync()\n";
3711 }; 3790 };
3712 3791
3713 warn "emergency_perl_save: leave\n"; 3792 info "emergency_perl_save: leave\n";
3714} 3793}
3715 3794
3716sub post_cleanup { 3795sub post_cleanup {
3717 my ($make_core) = @_; 3796 my ($make_core) = @_;
3718 3797
3719 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3720 if $make_core; 3799 if $make_core;
3721 3800
3722 my $fh = pidfile; 3801 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$; 3802 unlink $PIDFILE if <$fh> == $$;
3724} 3803}
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 3824 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 3825 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 3827 }
3749 warn "cleared package $pkg\n";#d#
3750} 3828}
3751 3829
3752sub do_reload_perl() { 3830sub do_reload_perl() {
3753 # can/must only be called in main 3831 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3755 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3756 return; 3834 return;
3757 } 3835 }
3758 3836
3759 return if $RELOAD++; 3837 return if $RELOAD++;
3760 3838
3761 my $t1 = EV::time; 3839 my $t1 = AE::time;
3762 3840
3763 while ($RELOAD) { 3841 while ($RELOAD) {
3764 warn "reloading..."; 3842 info "reloading...";
3765 3843
3766 warn "entering sync_job"; 3844 trace "entering sync_job";
3767 3845
3768 cf::sync_job { 3846 cf::sync_job {
3769 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3770 cf::emergency_save; 3848 cf::emergency_save;
3771 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3772 3850
3773 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3774 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3775 3853
3776 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3777 3855
3778 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3779 while (IO::AIO::nreqs || BDB::nreqs) { 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3780 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3781 } 3859 }
3782 3860
3783 warn "cancelling all extension coros"; 3861 trace "cancelling all extension coros";
3784 $_->cancel for values %EXT_CORO; 3862 $_->cancel for values %EXT_CORO;
3785 %EXT_CORO = (); 3863 %EXT_CORO = ();
3786 3864
3787 warn "removing commands"; 3865 trace "removing commands";
3788 %COMMAND = (); 3866 %COMMAND = ();
3789 3867
3790 warn "removing ext/exti commands"; 3868 trace "removing ext/exti commands";
3791 %EXTCMD = (); 3869 %EXTCMD = ();
3792 %EXTICMD = (); 3870 %EXTICMD = ();
3793 3871
3794 warn "unloading/nuking all extensions"; 3872 trace "unloading/nuking all extensions";
3795 for my $pkg (@EXTS) { 3873 for my $pkg (@EXTS) {
3796 warn "... unloading $pkg"; 3874 trace "... unloading $pkg";
3797 3875
3798 if (my $cb = $pkg->can ("unload")) { 3876 if (my $cb = $pkg->can ("unload")) {
3799 eval { 3877 eval {
3800 $cb->($pkg); 3878 $cb->($pkg);
3801 1 3879 1
3802 } or warn "$pkg unloaded, but with errors: $@"; 3880 } or error "$pkg unloaded, but with errors: $@";
3803 } 3881 }
3804 3882
3805 warn "... clearing $pkg"; 3883 trace "... clearing $pkg";
3806 clear_package $pkg; 3884 clear_package $pkg;
3807 } 3885 }
3808 3886
3809 warn "unloading all perl modules loaded from $LIBDIR"; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) { 3888 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812 3890
3813 warn "... unloading $k"; 3891 trace "... unloading $k";
3814 delete $INC{$k}; 3892 delete $INC{$k};
3815 3893
3816 $k =~ s/\.pm$//; 3894 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g; 3895 $k =~ s/\//::/g;
3818 3896
… …
3821 } 3899 }
3822 3900
3823 clear_package $k; 3901 clear_package $k;
3824 } 3902 }
3825 3903
3826 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3827 clear_package "safe::$_" 3905 clear_package "safe::$_"
3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3829 3907
3830 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3831 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833 3911
3834 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3835 # and global variables created in xs 3913 # and global variables created in xs
3836 #clear_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3837 3915
3838 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3839 3917
3840 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3841 require cf; 3919 require cf;
3842 cf::_connect_to_perl_1; 3920 cf::_connect_to_perl_1;
3843 3921
3844 warn "loading config and database again"; 3922 trace "loading config and database again";
3845 cf::reload_config; 3923 cf::reload_config;
3846 3924
3847 warn "loading extensions"; 3925 trace "loading extensions";
3848 cf::load_extensions; 3926 cf::load_extensions;
3849 3927
3850 if ($REATTACH_ON_RELOAD) { 3928 if ($REATTACH_ON_RELOAD) {
3851 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3852 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3853 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3854 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3855 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3856 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3857 } 3935 }
3858 3936
3859 warn "running post_init jobs"; 3937 trace "running post_init jobs";
3860 (pop @POST_INIT)->(1) while @POST_INIT; 3938 (pop @POST_INIT)->(1) while @POST_INIT;
3861 3939
3862 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3863 3941
3864 1 3942 1
3865 } or do { 3943 } or do {
3866 warn $@; 3944 error $@;
3867 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3868 }; 3946 };
3869 3947
3870 warn "reloaded"; 3948 info "reloaded";
3871 --$RELOAD; 3949 --$RELOAD;
3872 } 3950 }
3873 3951
3874 $t1 = EV::time - $t1; 3952 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 3953 info "reload completed in ${t1}s\n";
3876}; 3954};
3877 3955
3878our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3879 3957
3880sub reload_perl() { 3958sub reload_perl() {
… …
3882 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3883 3961
3884 $RELOAD_WATCHER ||= cf::async { 3962 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 3963 Coro::AIO::aio_wait cache_extensions;
3886 3964
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 3966 do_reload_perl;
3889 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3890 }; 3968 };
3891 }; 3969 };
3892} 3970}
… …
3933 return; 4011 return;
3934 } 4012 }
3935 4013
3936 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3937 4015
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939 4017
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942 Coro::async_pool { 4020 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3944 write_runtime_sync 4022 write_runtime_sync
3945 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3946 }; 4024 };
3947 } 4025 }
3948 4026
3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950 $sig->send; 4028 $sig->send;
… …
3958 4036
3959 if (0) { 4037 if (0) {
3960 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3961 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3964 } 4042 }
3965 } 4043 }
3966} 4044}
3967 4045
3968{ 4046{
… …
3978 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4056 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3979 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7; 4057 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3980 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4058 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3981 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4059 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3982 4060
4061 (Coro::async { # async to keep sync_job from complaining
3983 cf::sync_job { 4062 cf::sync_job {
3984 eval { 4063 eval {
3985 BDB::db_env_open 4064 BDB::db_env_open
3986 $DB_ENV, 4065 $DB_ENV,
3987 $BDBDIR, 4066 $BDBDIR,
3988 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4067 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3989 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4068 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3990 0666; 4069 0666;
3991 4070
3992 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4071 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
4072 };
4073
4074 cf::cleanup "db_env_open(db): $@" if $@;
3993 }; 4075 };
3994 4076 })->join;
3995 cf::cleanup "db_env_open(db): $@" if $@;
3996 };
3997 } 4077 }
3998 4078
3999 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub { 4079 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4000 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4080 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4001 }; 4081 };

Diff Legend

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