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.531 by root, Wed Apr 28 21:07:41 2010 UTC vs.
Revision 1.544 by root, Thu May 6 21:58:07 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 = ();
… …
124our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 127our $DB_ENV;
128 128
129our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 130
131our %CFG; 131our %CFG;
132 132
133our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 134our $RUNTIME;
… …
252 252
253=back 253=back
254 254
255=cut 255=cut
256 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
257$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 264 my $msg = join "", @_;
259 265
260 $msg .= "\n" 266 $msg .= "\n"
261 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
262 268
263 $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;
264 270
265 LOG llevError, $msg; 271 LOG llevWarn, $msg;
266}; 272};
267 273
268$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
270 276
271 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
272 278
273 if (in_main) {#d# 279 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 281 return;#d#
276 }#d# 282 }#d#
277 283
278 # kill coroutine otherwise 284 # kill coroutine otherwise
279 Coro::terminate 285 Coro::terminate
… …
512=cut 518=cut
513 519
514sub sync_job(&) { 520sub sync_job(&) {
515 my ($job) = @_; 521 my ($job) = @_;
516 522
517 if ($Coro::current == $Coro::main) { 523 if (in_main) {
518 my $time = AE::time; 524 my $time = AE::time;
519 525
520 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
522 528
523 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
524 530
525 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
526 532
527 my $busy = 1; 533 my $busy = 1;
528 my @res; 534 my @res;
529 535
530 (async { 536 (async {
531 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 538 @res = eval { $job->() };
533 warn $@ if $@; 539 error $@ if $@;
534 undef $busy; 540 undef $busy;
535 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
536 542
537 while ($busy) { 543 while ($busy) {
538 if (Coro::nready) { 544 if (Coro::nready) {
… …
651within each server. 657within each server.
652 658
653=cut 659=cut
654 660
655sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
656 my ($name) = @_; 665 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
658 667
659 eval { 668 eval {
660 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
… …
670} 679}
671 680
672our $DB; 681our $DB;
673 682
674sub db_init { 683sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
677 };
678} 685}
679 686
680sub db_get($$) { 687sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
682 689
683 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
684 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
685 694
686 $! ? () 695 $! ? ()
687 : $data 696 : $data
688 }
689} 697}
690 698
691sub db_put($$$) { 699sub db_put($$$) {
692 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
749 757
750 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 759 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
753 761
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 763
756 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
759 767
… …
769 777
770=cut 778=cut
771 779
772sub datalog($@) { 780sub datalog($@) {
773 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 783}
776 784
777=back 785=back
778 786
779=cut 787=cut
… …
974 982
975 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 985
978 } elsif (ref $type) { 986 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
980 988
981 } else { 989 } else {
982 shift @arg; 990 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
984 } 992 }
985 } 993 }
986} 994}
987 995
988sub _object_attach { 996sub _object_attach {
… …
998 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
999 } 1007 }
1000 1008
1001 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
1002 } else { 1010 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1012 }
1005 1013
1006 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
1007} 1015}
1008 1016
… …
1067 1075
1068 for (@$callbacks) { 1076 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1070 1078
1071 if ($@) { 1079 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1081 override;
1075 } 1082 }
1076 1083
1077 return 1 if $override; 1084 return 1 if $override;
1078 } 1085 }
… …
1157 for (@$attach) { 1164 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1160 } 1167 }
1161 } else { 1168 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1170 }
1164 } 1171 }
1165} 1172}
1166 1173
1167cf::attachable->attach ( 1174cf::attachable->attach (
… …
1194 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1195 1202
1196 sync_job { 1203 sync_job {
1197 if (length $$rdata) { 1204 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1207 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1208 if $VERBOSE_IO;
1202 1209
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
… …
1228 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1229 1236
1230 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1239 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1234 } 1241 }
1235 } else { 1242 } else {
1236 aio_unlink $filename; 1243 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1238 } 1245 }
… …
1262 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1270 $av = $st->{objs};
1264 } 1271 }
1265 1272
1266 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1275 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1276 if $VERBOSE_IO;
1270 1277
1271 ($data, $av) 1278 ($data, $av)
1272} 1279}
1273 1280
… …
1366 1373
1367 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1368 if $reply; 1375 if $reply;
1369 1376
1370 } else { 1377 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1379 }
1373 1380
1374 cf::override; 1381 cf::override;
1375 }, 1382 },
1376); 1383);
… …
1387 1394
1388 $grp 1395 $grp
1389} 1396}
1390 1397
1391sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1392 cf::sync_job { 1401 cf::sync_job {
1393 my %todo; 1402 my %todo;
1394 1403
1395 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1405 next unless -r $path;
… …
1414 1423
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1426
1418 $ext{source} = 1427 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1421 . $source 1430 . $source
1422 . "\n};\n1"; 1431 . "\n};\n1";
1423 1432
1424 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
… …
1436 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1446 next ext
1438 unless exists $done{$_}; 1447 unless exists $done{$_};
1439 } 1448 }
1440 1449
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1451
1443 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1444 1453
1445 if (length $@) { 1454 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1447 1456
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1458 if exists $v->{meta}{mandatory};
1450 1459
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1453 } else { 1462 } else {
1454 $done{$k} = delete $todo{$k}; 1463 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1464 push @EXTS, $v->{pkg};
1456 $progress = 1; 1465 $progress = 1;
1457 1466
1458 warn "$v->{base}: extension inactive.\n" 1467 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1468 unless $active;
1460 } 1469 }
1461 } 1470 }
1462 1471
1463 unless ($progress) { 1472 unless ($progress) {
… …
1839 1848
1840sub register { 1849sub register {
1841 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1842 my $pkg = caller; 1851 my $pkg = caller;
1843 1852
1844 no strict;
1845 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1846 1854
1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848} 1856}
1849 1857
… …
1861} 1869}
1862 1870
1863sub normalise { 1871sub normalise {
1864 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1865 1873
1866 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1867 1875
1868 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1869 1877
1870 # map plan: 1878 # map plan:
1871 # 1879 #
… …
1910 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1911 return $self; 1919 return $self;
1912 } 1920 }
1913 } 1921 }
1914 1922
1915 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1916 () 1924 ()
1917} 1925}
1918 1926
1919sub init { 1927sub init {
1920 my ($self) = @_; 1928 my ($self) = @_;
… …
2042} 2050}
2043 2051
2044sub find; 2052sub find;
2045sub find { 2053sub find {
2046 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
2055
2056 cf::cede_to_tick;
2047 2057
2048 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
2049 2059
2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051 my $guard2 = cf::lock_acquire "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2183} 2193}
2184 2194
2185sub find_sync { 2195sub find_sync {
2186 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2187 2197
2188 cf::sync_job { find $path, $origin } 2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main;
2200
2201 find $path, $origin
2189} 2202}
2190 2203
2191sub do_load_sync { 2204sub do_load_sync {
2192 my ($map) = @_; 2205 my ($map) = @_;
2193 2206
2194 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2196 2209
2197 cf::sync_job { $map->load }; 2210 $map->load;
2198} 2211}
2199 2212
2200our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2201our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2202 2215
… …
2314 2327
2315 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316 2329
2317 return if $self->players; 2330 return if $self->players;
2318 2331
2319 warn "resetting map ", $self->path, "\n"; 2332 cf::trace "resetting map ", $self->path, "\n";
2320 2333
2321 $self->in_memory (cf::MAP_SWAPPED); 2334 $self->in_memory (cf::MAP_SWAPPED);
2322 2335
2323 # need to save uniques path 2336 # need to save uniques path
2324 unless ($self->{deny_save}) { 2337 unless ($self->{deny_save}) {
… …
2689 2702
2690sub cf::object::player::goto { 2703sub cf::object::player::goto {
2691 my ($self, $path, $x, $y, $check, $done) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2692 2705
2693 if ($self->{_link_recursion} >= $MAX_LINKS) { 2706 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2707 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2708 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION; 2709 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 } 2710 }
2698 2711
2699 # do generation counting so two concurrent goto's will be executed in-order 2712 # do generation counting so two concurrent goto's will be executed in-order
… …
2847 $self->message ("Something went wrong deep within the deliantra server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2848 . "I'll try to bring you back to the map you were before. " 2861 . "I'll try to bring you back to the map you were before. "
2849 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2850 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2851 2864
2852 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2853 $self->leave_link; 2866 $self->leave_link;
2854 } 2867 }
2855 })->prio (1); 2868 })->prio (1);
2856} 2869}
2857 2870
… …
3170 3183
3171 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
3172 if $reply; 3185 if $reply;
3173 3186
3174 } else { 3187 } else {
3175 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3188 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176 } 3189 }
3177 3190
3178 cf::override; 3191 cf::override;
3179 }, 3192 },
3180); 3193);
… …
3261 decrease split destroy change_exp value msg lore send_msg)], 3274 decrease split destroy change_exp value msg lore send_msg)],
3262 ["cf::object::player" => qw(player)], 3275 ["cf::object::player" => qw(player)],
3263 ["cf::player" => qw(peaceful send_msg)], 3276 ["cf::player" => qw(peaceful send_msg)],
3264 ["cf::map" => qw(trigger)], 3277 ["cf::map" => qw(trigger)],
3265) { 3278) {
3266 no strict 'refs';
3267 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269 for @funs; 3281 for @funs;
3270} 3282}
3271 3283
… …
3310 local @cf::_safe_eval_args = values %vars; 3322 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval; 3323 @res = wantarray ? eval eval : scalar eval $eval;
3312 } 3324 }
3313 3325
3314 if ($@) { 3326 if ($@) {
3315 warn "$@"; 3327 warn "$@",
3316 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3317 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3318 } 3330 }
3319 3331
3320 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3321} 3333}
3322 3334
… …
3356 # for this (global event?) 3368 # for this (global event?)
3357 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3358 3370
3359 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360 3372
3361 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3362 3374
3363 my $facedata; 3375 my $facedata;
3364 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3365 or die "$path: $!"; 3377 or die "$path: $!";
3366 3378
… …
3400 3412
3401 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3402 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404 } else { 3416 } else {
3405 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3406 } 3418 }
3407 3419
3408 cf::cede_to_tick; 3420 cf::cede_to_tick;
3409 } 3421 }
3410 } 3422 }
… …
3487sub reload_treasures { 3499sub reload_treasures {
3488 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3489 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3490} 3502}
3491 3503
3504sub reload_exp {
3505 cf::init_experience;
3506}
3507
3492sub reload_sound { 3508sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n"; 3509 trace "loading sound config from $DATADIR/sound\n";
3494 3510
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data 3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!"; 3512 or die "$DATADIR/sound $!";
3497 3513
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
… …
3511 cf::sound::set $k => $face; 3527 cf::sound::set $k => $face;
3512 } 3528 }
3513} 3529}
3514 3530
3515sub reload_resources { 3531sub reload_resources {
3516 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3517 3533
3534 reload_exp;
3518 reload_facedata; 3535 reload_facedata;
3519 reload_sound; 3536 reload_sound;
3520 reload_archetypes; 3537 reload_archetypes;
3521 reload_regions; 3538 reload_regions;
3522 reload_treasures; 3539 reload_treasures;
3523 3540
3524 warn "finished reloading resource files\n"; 3541 trace "finished reloading resource files\n";
3525} 3542}
3526 3543
3527sub reload_config { 3544sub reload_config {
3528 warn "reloading config file...\n"; 3545 trace "reloading config file...\n";
3529 3546
3530 open my $fh, "<:utf8", "$CONFDIR/config" 3547 open my $fh, "<:utf8", "$CONFDIR/config"
3531 or return; 3548 or return;
3532 3549
3533 local $/; 3550 local $/;
… …
3544 and die "WARNING: m(un)lockall failed: $!\n"; 3561 and die "WARNING: m(un)lockall failed: $!\n";
3545 }; 3562 };
3546 warn $@ if $@; 3563 warn $@ if $@;
3547 } 3564 }
3548 3565
3549 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
3550} 3567}
3551 3568
3552sub pidfile() { 3569sub pidfile() {
3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3570 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3554 or die "$PIDFILE: $!"; 3571 or die "$PIDFILE: $!";
… …
3567 seek $fh, 0, 0; 3584 seek $fh, 0, 0;
3568 print $fh $$; 3585 print $fh $$;
3569} 3586}
3570 3587
3571sub main_loop { 3588sub main_loop {
3572 warn "EV::loop starting\n"; 3589 trace "EV::loop starting\n";
3573 if (1) { 3590 if (1) {
3574 EV::loop; 3591 EV::loop;
3575 } 3592 }
3576 warn "EV::loop returned\n"; 3593 trace "EV::loop returned\n";
3577 goto &main_loop unless $REALLY_UNLOOP; 3594 goto &main_loop unless $REALLY_UNLOOP;
3578} 3595}
3579 3596
3580sub main { 3597sub main {
3581 cf::init_globals; # initialise logging 3598 cf::init_globals; # initialise logging
3582 3599
3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3600 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3601 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3602 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3603 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3587 3604
3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3605 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3589 3606
… …
3597 }; 3614 };
3598 3615
3599 evthread_start IO::AIO::poll_fileno; 3616 evthread_start IO::AIO::poll_fileno;
3600 3617
3601 cf::sync_job { 3618 cf::sync_job {
3602 cf::init_experience; 3619 cf::incloader::init ();
3620
3603 cf::init_anim; 3621 cf::init_anim;
3604 cf::init_attackmess; 3622 cf::init_attackmess;
3605 cf::init_dynamic; 3623 cf::init_dynamic;
3606 3624
3607 cf::load_settings; 3625 cf::load_settings;
… …
3629 3647
3630 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3631 }; 3649 };
3632 3650
3633 cf::object::thawer::errors_are_fatal 0; 3651 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n"; 3652 info "parse errors in files are no longer fatal from this point on.\n";
3635 3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3636 main_loop; 3659 goto &main_loop;
3637} 3660}
3638 3661
3639############################################################################# 3662#############################################################################
3640# initialisation and cleanup 3663# initialisation and cleanup
3641 3664
… …
3680 or return; 3703 or return;
3681 3704
3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3683 and return; 3706 and return;
3684 3707
3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3686 3709
3687 1 3710 1
3688} 3711}
3689 3712
3690our $uuid_lock; 3713our $uuid_lock;
… …
3702 or return; 3725 or return;
3703 3726
3704 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3705 3728
3706 unless ($value) { 3729 unless ($value) {
3707 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3708 return; 3731 return;
3709 } 3732 }
3710 3733
3711 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3712 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3722 or return; 3745 or return;
3723 3746
3724 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3725 and return; 3748 and return;
3726 3749
3727 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3728 3751
3729 1 3752 1
3730 3753
3731} 3754}
3732 3755
… …
3738} 3761}
3739 3762
3740sub emergency_save() { 3763sub emergency_save() {
3741 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3742 3765
3743 warn "emergency_perl_save: enter\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3744 3772
3745 cf::sync_job { 3773 cf::sync_job {
3746 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3747 # save all maps without fsync, and later call a global sync
3748 # (which in turn might be very very slow)
3749 local $USE_FSYNC = 0;
3750 3775
3751 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3752 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3753 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3754 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3755 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3756 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3757 $pl->valid or next; 3782 $pl->valid or next;
3758 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3759 $pl->save; 3784 $pl->save;
3760 } 3785 }
3761 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3762 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3763 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3764 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3765 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3766 $map->valid or next; 3793 $map->valid or next;
3767 $map->save; 3794 $map->save;
3768 } 3795 }
3769 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3770 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3771 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3772 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3773 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3774 3803
3775 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3776 write_uuid_sync 1; 3805 write_uuid_sync 1;
3777 warn "emergency_perl_save: end write uuid\n"; 3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3778 }; 3826 };
3779 3827
3780 warn "emergency_perl_save: starting sync()\n";
3781 IO::AIO::aio_sync sub {
3782 warn "emergency_perl_save: finished sync()\n";
3783 };
3784
3785 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3786} 3829}
3787 3830
3788sub post_cleanup { 3831sub post_cleanup {
3789 my ($make_core) = @_; 3832 my ($make_core) = @_;
3790 3833
3834 IO::AIO::flush;
3835
3791 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3792 if $make_core; 3837 if $make_core;
3793 3838
3794 my $fh = pidfile; 3839 my $fh = pidfile;
3795 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3796} 3841}
… …
3820 } 3865 }
3821} 3866}
3822 3867
3823sub do_reload_perl() { 3868sub do_reload_perl() {
3824 # can/must only be called in main 3869 # can/must only be called in main
3825 if (in_main) { 3870 unless (in_main) {
3826 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3827 return; 3872 return;
3828 } 3873 }
3829 3874
3830 return if $RELOAD++; 3875 return if $RELOAD++;
3831 3876
3832 my $t1 = AE::time; 3877 my $t1 = AE::time;
3833 3878
3834 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3835 warn "reloading..."; 3881 info "reloading...";
3836 3882
3837 warn "entering sync_job"; 3883 trace "entering sync_job";
3838 3884
3839 cf::sync_job { 3885 cf::sync_job {
3840 cf::write_runtime_sync; # external watchdog should not bark
3841 cf::emergency_save; 3886 #cf::emergency_save;
3842 cf::write_runtime_sync; # external watchdog should not bark
3843 3887
3844 warn "syncing database to disk";
3845 BDB::db_env_txn_checkpoint $DB_ENV;
3846
3847 # if anything goes wrong in here, we should simply crash as we already saved
3848
3849 warn "flushing outstanding aio requests";
3850 while (IO::AIO::nreqs || BDB::nreqs) {
3851 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3852 }
3853
3854 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3855 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3856 %EXT_CORO = (); 3890 %EXT_CORO = ();
3857 3891
3858 warn "removing commands"; 3892 trace "removing commands";
3859 %COMMAND = (); 3893 %COMMAND = ();
3860 3894
3861 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3862 %EXTCMD = (); 3896 %EXTCMD = ();
3863 %EXTICMD = (); 3897 %EXTICMD = ();
3864 3898
3865 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3866 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3867 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3868 3902
3869 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3870 eval { 3904 eval {
3871 $cb->($pkg); 3905 $cb->($pkg);
3872 1 3906 1
3873 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3874 } 3908 }
3875 3909
3876 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3877 clear_package $pkg; 3911 clear_package $pkg;
3878 } 3912 }
3879 3913
3880 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3881 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3882 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3883 3917
3884 warn "... unloading $k"; 3918 trace "... unloading $k";
3885 delete $INC{$k}; 3919 delete $INC{$k};
3886 3920
3887 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3888 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3889 3923
… …
3892 } 3926 }
3893 3927
3894 clear_package $k; 3928 clear_package $k;
3895 } 3929 }
3896 3930
3897 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3898 clear_package "safe::$_" 3932 clear_package "safe::$_"
3899 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3900 3934
3901 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3902 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3904 3938
3905 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3906 # and global variables created in xs 3940 # and global variables created in xs
3907 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3908 3942
3909 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3910 3944
3911 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3912 require cf; 3946 require cf;
3913 cf::_connect_to_perl_1; 3947 cf::_connect_to_perl_1;
3914 3948
3915 warn "loading config and database again"; 3949 trace "loading config and database again";
3916 cf::reload_config; 3950 cf::reload_config;
3917 3951
3918 warn "loading extensions"; 3952 trace "loading extensions";
3919 cf::load_extensions; 3953 cf::load_extensions;
3920 3954
3921 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3922 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3923 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3924 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3925 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3926 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3927 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3928 } 3962 }
3929 3963
3930 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3931 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3932 3966
3933 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3934 3968
3935 1 3969 1
3936 } or do { 3970 } or do {
3937 warn $@; 3971 error $@;
3938 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3939 }; 3973 };
3940 3974
3941 warn "reloaded"; 3975 info "reloaded";
3942 --$RELOAD; 3976 --$RELOAD;
3943 } 3977 }
3944 3978
3945 $t1 = AE::time - $t1; 3979 $t1 = AE::time - $t1;
3946 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3947}; 3981};
3948 3982
3949our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3950 3984
3951sub reload_perl() { 3985sub reload_perl() {
… …
3972 reload_perl; 4006 reload_perl;
3973 }; 4007 };
3974 } 4008 }
3975}; 4009};
3976 4010
3977unshift @INC, $LIBDIR; 4011#############################################################################
3978 4012
3979my $bug_warning = 0; 4013my $bug_warning = 0;
3980 4014
3981our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3982our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
… …
4011 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4013 Coro::async_pool { 4047 Coro::async_pool {
4014 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
4015 write_runtime_sync 4049 write_runtime_sync
4016 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
4017 }; 4051 };
4018 } 4052 }
4019 4053
4020 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4021 $sig->send; 4055 $sig->send;
… …
4029 4063
4030 if (0) { 4064 if (0) {
4031 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
4032 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
4033 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4034 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
4035 } 4069 }
4036 } 4070 }
4037} 4071}
4038 4072
4039{ 4073{

Diff Legend

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