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.526 by root, Wed Apr 21 05:48:35 2010 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC

… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
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 112
113our $OUTPUT_RATE_MIN = 4000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
115 118
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 121our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
249 252
250=back 253=back
251 254
252=cut 255=cut
253 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
254$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 264 my $msg = join "", @_;
256 265
257 $msg .= "\n" 266 $msg .= "\n"
258 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
259 268
260 $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;
261 270
262 LOG llevError, $msg; 271 LOG llevWarn, $msg;
263}; 272};
264 273
265$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
267 276
268 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
269 278
270 if (in_main) {#d# 279 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 281 return;#d#
273 }#d# 282 }#d#
274 283
275 # kill coroutine otherwise 284 # kill coroutine otherwise
276 Coro::terminate 285 Coro::terminate
… …
509=cut 518=cut
510 519
511sub sync_job(&) { 520sub sync_job(&) {
512 my ($job) = @_; 521 my ($job) = @_;
513 522
514 if ($Coro::current == $Coro::main) { 523 if (in_main) {
515 my $time = AE::time; 524 my $time = AE::time;
516 525
517 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
519 528
520 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
521 530
522 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
523 532
524 my $busy = 1; 533 my $busy = 1;
525 my @res; 534 my @res;
526 535
527 (async { 536 (async {
528 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 538 @res = eval { $job->() };
530 warn $@ if $@; 539 error $@ if $@;
531 undef $busy; 540 undef $busy;
532 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
533 542
534 while ($busy) { 543 while ($busy) {
535 if (Coro::nready) { 544 if (Coro::nready) {
… …
648within each server. 657within each server.
649 658
650=cut 659=cut
651 660
652sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
653 my ($name) = @_; 665 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
655 667
656 eval { 668 eval {
657 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
… …
667} 679}
668 680
669our $DB; 681our $DB;
670 682
671sub db_init { 683sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
674 };
675} 685}
676 686
677sub db_get($$) { 687sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
679 689
680 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
681 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
682 694
683 $! ? () 695 $! ? ()
684 : $data 696 : $data
685 }
686} 697}
687 698
688sub db_put($$$) { 699sub db_put($$$) {
689 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
746 757
747 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 759 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
750 761
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 763
753 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
756 767
… …
766 777
767=cut 778=cut
768 779
769sub datalog($@) { 780sub datalog($@) {
770 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 783}
773 784
774=back 785=back
775 786
776=cut 787=cut
… …
971 982
972 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 985
975 } elsif (ref $type) { 986 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
977 988
978 } else { 989 } else {
979 shift @arg; 990 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
981 } 992 }
982 } 993 }
983} 994}
984 995
985sub _object_attach { 996sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
996 } 1007 }
997 1008
998 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
999 } else { 1010 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1012 }
1002 1013
1003 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
1004} 1015}
1005 1016
… …
1064 1075
1065 for (@$callbacks) { 1076 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1067 1078
1068 if ($@) { 1079 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1081 override;
1072 } 1082 }
1073 1083
1074 return 1 if $override; 1084 return 1 if $override;
1075 } 1085 }
… …
1154 for (@$attach) { 1164 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1157 } 1167 }
1158 } else { 1168 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1170 }
1161 } 1171 }
1162} 1172}
1163 1173
1164cf::attachable->attach ( 1174cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1192 1202
1193 sync_job { 1203 sync_job {
1194 if (length $$rdata) { 1204 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1198 1209
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1225 1236
1226 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1239 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1230 } 1241 }
1231 } else { 1242 } else {
1232 aio_unlink $filename; 1243 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1234 } 1245 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1270 $av = $st->{objs};
1260 } 1271 }
1261 1272
1262 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1265 1277
1266 ($data, $av) 1278 ($data, $av)
1267} 1279}
1268 1280
1269=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
… …
1361 1373
1362 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1375 if $reply;
1364 1376
1365 } else { 1377 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1379 }
1368 1380
1369 cf::override; 1381 cf::override;
1370 }, 1382 },
1371); 1383);
… …
1382 1394
1383 $grp 1395 $grp
1384} 1396}
1385 1397
1386sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1387 cf::sync_job { 1401 cf::sync_job {
1388 my %todo; 1402 my %todo;
1389 1403
1390 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1405 next unless -r $path;
… …
1409 1423
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1426
1413 $ext{source} = 1427 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1416 . $source 1430 . $source
1417 . "\n};\n1"; 1431 . "\n};\n1";
1418 1432
1419 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1446 next ext
1433 unless exists $done{$_}; 1447 unless exists $done{$_};
1434 } 1448 }
1435 1449
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1451
1438 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1439 1453
1440 if (length $@) { 1454 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1442 1457
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1459 if exists $v->{meta}{mandatory};
1445 1460
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1463 } else {
1449 $done{$k} = delete $todo{$k}; 1464 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1465 push @EXTS, $v->{pkg};
1451 $progress = 1; 1466 $progress = 1;
1452 1467
1453 warn "$v->{base}: extension inactive.\n" 1468 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1469 unless $active;
1455 } 1470 }
1456 } 1471 }
1457 1472
1458 unless ($progress) { 1473 unless ($progress) {
… …
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1646
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1633 $pl->deactivate; 1648 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1637 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1638 1652
1639 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1835 1849
1836sub register { 1850sub register {
1837 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1852 my $pkg = caller;
1839 1853
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1855
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1857}
1845 1858
… …
2162 or next; 2175 or next;
2163 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2164 or next; 2177 or next;
2165 $neigh->load; 2178 $neigh->load;
2166 2179
2180 # now find the diagonal neighbours
2167 push @neigh, 2181 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2184 }
2171 2185
… …
2178} 2192}
2179 2193
2180sub find_sync { 2194sub find_sync {
2181 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2182 2196
2183 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2184} 2201}
2185 2202
2186sub do_load_sync { 2203sub do_load_sync {
2187 my ($map) = @_; 2204 my ($map) = @_;
2188 2205
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2191 2208
2192 cf::sync_job { $map->load }; 2209 $map->load;
2193} 2210}
2194 2211
2195our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2197 2214
… …
2309 2326
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2328
2312 return if $self->players; 2329 return if $self->players;
2313 2330
2314 warn "resetting map ", $self->path, "\n"; 2331 cf::trace "resetting map ", $self->path, "\n";
2315 2332
2316 $self->in_memory (cf::MAP_SWAPPED); 2333 $self->in_memory (cf::MAP_SWAPPED);
2317 2334
2318 # need to save uniques path 2335 # need to save uniques path
2319 unless ($self->{deny_save}) { 2336 unless ($self->{deny_save}) {
… …
2583 2600
2584Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2585 2602
2586The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2589map. 2606map.
2590 2607
2591Will never block. 2608Will never block.
2592 2609
2593=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2615 my ($self) = @_; 2632 my ($self) = @_;
2616 2633
2617 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2618 2635
2636 ++$self->{_link_recursion};
2637
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2639
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2623 2642
… …
2654 $map->load_neighbours; 2673 $map->load_neighbours;
2655 2674
2656 return unless $self->contr->active; 2675 return unless $self->contr->active;
2657 2676
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2660 2679 # entering was successful
2680 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2682 $self->activate_recursive;
2663# unless exists $self->{_link_pos}; # maybe we re in-flight again 2683 }
2664}
2665 2684
2685}
2686
2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2667 2688
2668Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2669her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2670that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2671the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
… …
2678 2699
2679our $GOTOGEN; 2700our $GOTOGEN;
2680 2701
2681sub cf::object::player::goto { 2702sub cf::object::player::goto {
2682 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2683 2710
2684 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2685 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2686 2713
2687 $self->enter_link; 2714 $self->enter_link;
… …
2711 my $map = eval { 2738 my $map = eval {
2712 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2713 2740
2714 if ($map) { 2741 if ($map) {
2715 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2716 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2717 } else { 2744 } else {
2718 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2719 } 2746 }
2720 2747
2721 $map 2748 $map
… …
2729 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2730 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2731 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2732 } 2759 }
2733 2760
2734 $done->() if $done; 2761 $done->($self) if $done;
2735 })->prio (1); 2762 })->prio (1);
2736} 2763}
2737 2764
2738=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2739 2766
… …
2832 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2833 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2834 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2835 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2836 2863
2837 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2838 $self->leave_link; 2865 $self->leave_link;
2839 } 2866 }
2840 })->prio (1); 2867 })->prio (1);
2841} 2868}
2842 2869
… …
3155 3182
3156 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3157 if $reply; 3184 if $reply;
3158 3185
3159 } else { 3186 } else {
3160 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3161 } 3188 }
3162 3189
3163 cf::override; 3190 cf::override;
3164 }, 3191 },
3165); 3192);
… …
3246 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3247 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3248 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3249 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3250) { 3277) {
3251 no strict 'refs';
3252 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3254 for @funs; 3280 for @funs;
3255} 3281}
3256 3282
… …
3295 local @cf::_safe_eval_args = values %vars; 3321 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval; 3322 @res = wantarray ? eval eval : scalar eval $eval;
3297 } 3323 }
3298 3324
3299 if ($@) { 3325 if ($@) {
3300 warn "$@"; 3326 warn "$@",
3301 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3302 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3303 } 3329 }
3304 3330
3305 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3306} 3332}
3307 3333
… …
3332=cut 3358=cut
3333 3359
3334############################################################################# 3360#############################################################################
3335# the server's init and main functions 3361# the server's init and main functions
3336 3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3405
3337sub load_facedata($) { 3406sub load_facedata($) {
3338 my ($path) = @_; 3407 my ($path) = @_;
3339 3408
3340 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3341 # for this (global event?) 3410 # for this (global event?)
3342 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3343 3412
3344 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3345 3414
3346 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3347 3416
3348 my $facedata; 3417 my $facedata;
3349 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3350 or die "$path: $!"; 3419 or die "$path: $!";
3351 3420
… …
3385 3454
3386 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3387 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3389 } else { 3458 } else {
3390 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3391 } 3460 }
3392 3461
3393 cf::cede_to_tick; 3462 cf::cede_to_tick;
3394 } 3463 }
3395 } 3464 }
… …
3413 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3414 3483
3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3416 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3417 } else { 3486 } else {
3418 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3419 } 3488 }
3420 3489
3421 cf::cede_to_tick; 3490 cf::cede_to_tick;
3422 } 3491 }
3423 } 3492 }
3424 3493
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3426 3495
3427 1 3496 1
3428} 3497}
3429
3430cf::global->attach (on_resource_update => sub {
3431 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435 my $sound = $soundconf->{compat}[$_]
3436 or next;
3437
3438 my $face = cf::face::find "sound/$sound->[1]";
3439 cf::sound::set $sound->[0] => $face;
3440 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441 }
3442
3443 while (my ($k, $v) = each %{$soundconf->{event}}) {
3444 my $face = cf::face::find "sound/$v";
3445 cf::sound::set $k => $face;
3446 }
3447 }
3448});
3449 3498
3450register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3451 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3452 3501
3453 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
… …
3492sub reload_treasures { 3541sub reload_treasures {
3493 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3494 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3495} 3544}
3496 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3497sub reload_resources { 3569sub reload_resources {
3498 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3499 3571
3500 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3501 reload_archetypes; 3574 reload_archetypes;
3502 reload_regions; 3575 reload_regions;
3503 reload_treasures; 3576 reload_treasures;
3504 3577
3505 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3506} 3579}
3507 3580
3508sub reload_config { 3581sub reload_config {
3509 warn "reloading config file...\n"; 3582 trace "reloading config file...\n";
3510 3583
3511 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3512 or return; 3585 or return;
3513 3586
3514 local $/; 3587 local $/;
3515 *CFG = YAML::XS::Load scalar <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3516 3589
3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3518 3591
3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3521 3594
3522 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
… …
3525 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3526 }; 3599 };
3527 warn $@ if $@; 3600 warn $@ if $@;
3528 } 3601 }
3529 3602
3530 warn "finished reloading resource files\n"; 3603 trace "finished reloading resource files\n";
3531} 3604}
3532 3605
3533sub pidfile() { 3606sub pidfile() {
3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
… …
3548 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3549 print $fh $$; 3622 print $fh $$;
3550} 3623}
3551 3624
3552sub main_loop { 3625sub main_loop {
3553 warn "EV::loop starting\n"; 3626 trace "EV::loop starting\n";
3554 if (1) { 3627 if (1) {
3555 EV::loop; 3628 EV::loop;
3556 } 3629 }
3557 warn "EV::loop returned\n"; 3630 trace "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP; 3631 goto &main_loop unless $REALLY_UNLOOP;
3559} 3632}
3560 3633
3561sub main { 3634sub main {
3562 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3563 3636
3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568 3641
3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570 3643
… …
3578 }; 3651 };
3579 3652
3580 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3581 3654
3582 cf::sync_job { 3655 cf::sync_job {
3656 init_inc;
3657
3583 cf::init_experience; 3658 cf::init_experience;
3584 cf::init_anim; 3659 cf::init_anim;
3585 cf::init_attackmess; 3660 cf::init_attackmess;
3586 cf::init_dynamic; 3661 cf::init_dynamic;
3587 3662
… …
3610 3685
3611 (pop @POST_INIT)->(0) while @POST_INIT; 3686 (pop @POST_INIT)->(0) while @POST_INIT;
3612 }; 3687 };
3613 3688
3614 cf::object::thawer::errors_are_fatal 0; 3689 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n"; 3690 info "parse errors in files are no longer fatal from this point on.\n";
3616 3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3617 main_loop; 3697 goto &main_loop;
3618} 3698}
3619 3699
3620############################################################################# 3700#############################################################################
3621# initialisation and cleanup 3701# initialisation and cleanup
3622 3702
… …
3661 or return; 3741 or return;
3662 3742
3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3664 and return; 3744 and return;
3665 3745
3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3667 3747
3668 1 3748 1
3669} 3749}
3670 3750
3671our $uuid_lock; 3751our $uuid_lock;
… …
3683 or return; 3763 or return;
3684 3764
3685 my $value = uuid_seq uuid_cur; 3765 my $value = uuid_seq uuid_cur;
3686 3766
3687 unless ($value) { 3767 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n"; 3768 info "cowardly refusing to write zero uuid value!\n";
3689 return; 3769 return;
3690 } 3770 }
3691 3771
3692 my $value = uuid_str $value + $uuid_skip; 3772 my $value = uuid_str $value + $uuid_skip;
3693 $uuid_skip = 0; 3773 $uuid_skip = 0;
… …
3703 or return; 3783 or return;
3704 3784
3705 aio_rename "$uuid~", $uuid 3785 aio_rename "$uuid~", $uuid
3706 and return; 3786 and return;
3707 3787
3708 warn "uuid file written ($value).\n"; 3788 trace "uuid file written ($value).\n";
3709 3789
3710 1 3790 1
3711 3791
3712} 3792}
3713 3793
… …
3719} 3799}
3720 3800
3721sub emergency_save() { 3801sub emergency_save() {
3722 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3723 3803
3724 warn "emergency_perl_save: enter\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3725 3810
3726 cf::sync_job { 3811 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so 3812 cf::write_runtime_sync; # external watchdog should not bark
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731 3813
3732 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3733 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3734 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3735 warn "emergency_perl_save: begin player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3736 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3737 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3738 $pl->valid or next; 3820 $pl->valid or next;
3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3740 $pl->save; 3822 $pl->save;
3741 } 3823 }
3742 warn "emergency_perl_save: end player save\n"; 3824 info "emergency_perl_save: end player save\n";
3743 3825
3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3744 warn "emergency_perl_save: begin map save\n"; 3828 info "emergency_perl_save: begin map save\n";
3745 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3746 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3747 $map->valid or next; 3831 $map->valid or next;
3748 $map->save; 3832 $map->save;
3749 } 3833 }
3750 warn "emergency_perl_save: end map save\n"; 3834 info "emergency_perl_save: end map save\n";
3751 3835
3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3752 warn "emergency_perl_save: begin database checkpoint\n"; 3838 info "emergency_perl_save: begin database checkpoint\n";
3753 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3754 warn "emergency_perl_save: end database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3755 3841
3756 warn "emergency_perl_save: begin write uuid\n"; 3842 info "emergency_perl_save: begin write uuid\n";
3757 write_uuid_sync 1; 3843 write_uuid_sync 1;
3758 warn "emergency_perl_save: end write uuid\n"; 3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3759 }; 3864 };
3760 3865
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3766 warn "emergency_perl_save: leave\n"; 3866 info "emergency_perl_save: leave\n";
3767} 3867}
3768 3868
3769sub post_cleanup { 3869sub post_cleanup {
3770 my ($make_core) = @_; 3870 my ($make_core) = @_;
3771 3871
3872 IO::AIO::flush;
3873
3772 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3773 if $make_core; 3875 if $make_core;
3774 3876
3775 my $fh = pidfile; 3877 my $fh = pidfile;
3776 unlink $PIDFILE if <$fh> == $$; 3878 unlink $PIDFILE if <$fh> == $$;
3777} 3879}
… …
3802} 3904}
3803 3905
3804sub do_reload_perl() { 3906sub do_reload_perl() {
3805 # can/must only be called in main 3907 # can/must only be called in main
3806 if (in_main) { 3908 if (in_main) {
3807 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3808 return; 3910 return;
3809 } 3911 }
3810 3912
3811 return if $RELOAD++; 3913 return if $RELOAD++;
3812 3914
3813 my $t1 = AE::time; 3915 my $t1 = AE::time;
3814 3916
3815 while ($RELOAD) { 3917 while ($RELOAD) {
3816 warn "reloading..."; 3918 info "reloading...";
3817 3919
3818 warn "entering sync_job"; 3920 trace "entering sync_job";
3819 3921
3820 cf::sync_job { 3922 cf::sync_job {
3821 cf::write_runtime_sync; # external watchdog should not bark
3822 cf::emergency_save; 3923 cf::emergency_save;
3823 cf::write_runtime_sync; # external watchdog should not bark
3824 3924
3825 warn "syncing database to disk";
3826 BDB::db_env_txn_checkpoint $DB_ENV;
3827
3828 # if anything goes wrong in here, we should simply crash as we already saved
3829
3830 warn "flushing outstanding aio requests";
3831 while (IO::AIO::nreqs || BDB::nreqs) {
3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3833 }
3834
3835 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3836 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3837 %EXT_CORO = (); 3927 %EXT_CORO = ();
3838 3928
3839 warn "removing commands"; 3929 trace "removing commands";
3840 %COMMAND = (); 3930 %COMMAND = ();
3841 3931
3842 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3843 %EXTCMD = (); 3933 %EXTCMD = ();
3844 %EXTICMD = (); 3934 %EXTICMD = ();
3845 3935
3846 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3847 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3848 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3849 3939
3850 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3851 eval { 3941 eval {
3852 $cb->($pkg); 3942 $cb->($pkg);
3853 1 3943 1
3854 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3855 } 3945 }
3856 3946
3857 warn "... clearing $pkg"; 3947 trace "... clearing $pkg";
3858 clear_package $pkg; 3948 clear_package $pkg;
3859 } 3949 }
3860 3950
3861 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3862 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3863 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864 3954
3865 warn "... unloading $k"; 3955 trace "... unloading $k";
3866 delete $INC{$k}; 3956 delete $INC{$k};
3867 3957
3868 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3869 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3870 3960
… …
3873 } 3963 }
3874 3964
3875 clear_package $k; 3965 clear_package $k;
3876 } 3966 }
3877 3967
3878 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3879 clear_package "safe::$_" 3969 clear_package "safe::$_"
3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3881 3971
3882 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3883 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3885 3975
3886 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3887 # and global variables created in xs 3977 # and global variables created in xs
3888 #clear_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3889 3979
3890 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3891 3981
3892 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3893 require cf; 3983 require cf;
3894 cf::_connect_to_perl_1; 3984 cf::_connect_to_perl_1;
3895 3985
3896 warn "loading config and database again"; 3986 trace "loading config and database again";
3897 cf::reload_config; 3987 cf::reload_config;
3898 3988
3899 warn "loading extensions"; 3989 trace "loading extensions";
3900 cf::load_extensions; 3990 cf::load_extensions;
3901 3991
3902 if ($REATTACH_ON_RELOAD) { 3992 if ($REATTACH_ON_RELOAD) {
3903 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3904 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3905 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3906 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3907 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3908 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3909 } 3999 }
3910 4000
3911 warn "running post_init jobs"; 4001 trace "running post_init jobs";
3912 (pop @POST_INIT)->(1) while @POST_INIT; 4002 (pop @POST_INIT)->(1) while @POST_INIT;
3913 4003
3914 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3915 4005
3916 1 4006 1
3917 } or do { 4007 } or do {
3918 warn $@; 4008 error $@;
3919 cf::cleanup "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3920 }; 4010 };
3921 4011
3922 warn "reloaded"; 4012 info "reloaded";
3923 --$RELOAD; 4013 --$RELOAD;
3924 } 4014 }
3925 4015
3926 $t1 = AE::time - $t1; 4016 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n"; 4017 info "reload completed in ${t1}s\n";
3928}; 4018};
3929 4019
3930our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3931 4021
3932sub reload_perl() { 4022sub reload_perl() {
… …
3953 reload_perl; 4043 reload_perl;
3954 }; 4044 };
3955 } 4045 }
3956}; 4046};
3957 4047
3958unshift @INC, $LIBDIR; 4048#############################################################################
3959 4049
3960my $bug_warning = 0; 4050my $bug_warning = 0;
3961 4051
3962our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3963our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
… …
3992 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3994 Coro::async_pool { 4084 Coro::async_pool {
3995 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3996 write_runtime_sync 4086 write_runtime_sync
3997 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3998 }; 4088 };
3999 } 4089 }
4000 4090
4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4002 $sig->send; 4092 $sig->send;
… …
4010 4100
4011 if (0) { 4101 if (0) {
4012 if ($NEXT_TICK) { 4102 if ($NEXT_TICK) {
4013 my $jitter = $TICK_START - $NEXT_TICK; 4103 my $jitter = $TICK_START - $NEXT_TICK;
4014 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4015 warn "jitter $JITTER\n";#d# 4105 debug "jitter $JITTER\n";#d#
4016 } 4106 }
4017 } 4107 }
4018} 4108}
4019 4109
4020{ 4110{

Diff Legend

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