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.529 by root, Wed Apr 28 11:28:22 2010 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 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 = 3000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 114our $OUTPUT_RATE_MAX = 1000000;
115 115
116our $MAX_LINKS = 32; # how many chained exits to follow 116our $MAX_LINKS = 32; # how many chained exits to follow
… …
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;
… …
233from wherever your confdir points to. 233from wherever your confdir points to.
234 234
235=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
236 236
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
240 245
241=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
242 247
243This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
252 257
253=back 258=back
254 259
255=cut 260=cut
256 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
257$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 269 my $msg = join "", @_;
259 270
260 $msg .= "\n" 271 $msg .= "\n"
261 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
262 273
263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
264 275
265 LOG llevError, $msg; 276 LOG llevWarn, $msg;
266}; 277};
267 278
268$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
270 281
271 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
272 283
273 if (in_main) {#d# 284 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 286 return;#d#
276 }#d# 287 }#d#
277 288
278 # kill coroutine otherwise 289 # kill coroutine otherwise
279 Coro::terminate 290 Coro::terminate
… …
512=cut 523=cut
513 524
514sub sync_job(&) { 525sub sync_job(&) {
515 my ($job) = @_; 526 my ($job) = @_;
516 527
517 if ($Coro::current == $Coro::main) { 528 if (in_main) {
518 my $time = AE::time; 529 my $time = AE::time;
519 530
520 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
522 533
523 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
524 535
525 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
526 537
527 my $busy = 1; 538 my $busy = 1;
528 my @res; 539 my @res;
529 540
530 (async { 541 (async {
531 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 543 @res = eval { $job->() };
533 warn $@ if $@; 544 error $@ if $@;
534 undef $busy; 545 undef $busy;
535 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
536 547
537 while ($busy) { 548 while ($busy) {
538 if (Coro::nready) { 549 if (Coro::nready) {
… …
651within each server. 662within each server.
652 663
653=cut 664=cut
654 665
655sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
656 my ($name) = @_; 670 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
658 672
659 eval { 673 eval {
660 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
… …
670} 684}
671 685
672our $DB; 686our $DB;
673 687
674sub db_init { 688sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
677 };
678} 690}
679 691
680sub db_get($$) { 692sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
682 694
683 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
684 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
685 699
686 $! ? () 700 $! ? ()
687 : $data 701 : $data
688 }
689} 702}
690 703
691sub db_put($$$) { 704sub db_put($$$) {
692 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
749 762
750 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 764 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
753 766
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 768
756 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
759 772
… …
769 782
770=cut 783=cut
771 784
772sub datalog($@) { 785sub datalog($@) {
773 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 788}
776 789
777=back 790=back
778 791
779=cut 792=cut
… …
974 987
975 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 990
978 } elsif (ref $type) { 991 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
980 993
981 } else { 994 } else {
982 shift @arg; 995 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
984 } 997 }
985 } 998 }
986} 999}
987 1000
988sub _object_attach { 1001sub _object_attach {
… …
998 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
999 } 1012 }
1000 1013
1001 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
1002 } else { 1015 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1017 }
1005 1018
1006 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
1007} 1020}
1008 1021
… …
1067 1080
1068 for (@$callbacks) { 1081 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
1070 1083
1071 if ($@) { 1084 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1086 override;
1075 } 1087 }
1076 1088
1077 return 1 if $override; 1089 return 1 if $override;
1078 } 1090 }
… …
1157 for (@$attach) { 1169 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1160 } 1172 }
1161 } else { 1173 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1175 }
1164 } 1176 }
1165} 1177}
1166 1178
1167cf::attachable->attach ( 1179cf::attachable->attach (
… …
1194 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1195 1207
1196 sync_job { 1208 sync_job {
1197 if (length $$rdata) { 1209 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1212 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1213 if $VERBOSE_IO;
1202 1214
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1216 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
… …
1228 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1229 1241
1230 $filename =~ s%/[^/]+$%%; 1242 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1243 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1244 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1234 } 1246 }
1235 } else { 1247 } else {
1236 aio_unlink $filename; 1248 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1238 } 1250 }
… …
1262 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1275 $av = $st->{objs};
1264 } 1276 }
1265 1277
1266 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1280 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1281 if $VERBOSE_IO;
1270 1282
1271 ($data, $av) 1283 ($data, $av)
1272} 1284}
1273 1285
… …
1366 1378
1367 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1368 if $reply; 1380 if $reply;
1369 1381
1370 } else { 1382 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1384 }
1373 1385
1374 cf::override; 1386 cf::override;
1375 }, 1387 },
1376); 1388);
… …
1387 1399
1388 $grp 1400 $grp
1389} 1401}
1390 1402
1391sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1392 cf::sync_job { 1406 cf::sync_job {
1393 my %todo; 1407 my %todo;
1394 1408
1395 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1410 next unless -r $path;
… …
1414 1428
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1431
1418 $ext{source} = 1432 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1421 . $source 1435 . $source
1422 . "\n};\n1"; 1436 . "\n};\n1";
1423 1437
1424 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
… …
1436 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1451 next ext
1438 unless exists $done{$_}; 1452 unless exists $done{$_};
1439 } 1453 }
1440 1454
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1456
1443 my $active = eval $v->{source}; 1457 my $active = eval $v->{source};
1444 1458
1445 if (length $@) { 1459 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1460 error "$v->{path}: $@\n";
1447 1461
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1463 if exists $v->{meta}{mandatory};
1450 1464
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1453 } else { 1467 } else {
1454 $done{$k} = delete $todo{$k}; 1468 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1469 push @EXTS, $v->{pkg};
1456 $progress = 1; 1470 $progress = 1;
1457 1471
1458 warn "$v->{base}: extension inactive.\n" 1472 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1473 unless $active;
1460 } 1474 }
1461 } 1475 }
1462 1476
1463 unless ($progress) { 1477 unless ($progress) {
… …
1839 1853
1840sub register { 1854sub register {
1841 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1842 my $pkg = caller; 1856 my $pkg = caller;
1843 1857
1844 no strict;
1845 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1846 1859
1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848} 1861}
1849 1862
… …
1861} 1874}
1862 1875
1863sub normalise { 1876sub normalise {
1864 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1865 1878
1866 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1867 1880
1868 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1869 1882
1870 # map plan: 1883 # map plan:
1871 # 1884 #
… …
1910 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1911 return $self; 1924 return $self;
1912 } 1925 }
1913 } 1926 }
1914 1927
1915 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1916 () 1929 ()
1917} 1930}
1918 1931
1919sub init { 1932sub init {
1920 my ($self) = @_; 1933 my ($self) = @_;
… …
2042} 2055}
2043 2056
2044sub find; 2057sub find;
2045sub find { 2058sub find {
2046 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
2060
2061 cf::cede_to_tick;
2047 2062
2048 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
2049 2064
2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051 my $guard2 = cf::lock_acquire "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2183} 2198}
2184 2199
2185sub find_sync { 2200sub find_sync {
2186 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2187 2202
2188 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2189} 2207}
2190 2208
2191sub do_load_sync { 2209sub do_load_sync {
2192 my ($map) = @_; 2210 my ($map) = @_;
2193 2211
2194 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2196 2214
2197 cf::sync_job { $map->load }; 2215 $map->load;
2198} 2216}
2199 2217
2200our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2201our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2202 2220
… …
2314 2332
2315 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316 2334
2317 return if $self->players; 2335 return if $self->players;
2318 2336
2319 warn "resetting map ", $self->path, "\n"; 2337 cf::trace "resetting map ", $self->path, "\n";
2320 2338
2321 $self->in_memory (cf::MAP_SWAPPED); 2339 $self->in_memory (cf::MAP_SWAPPED);
2322 2340
2323 # need to save uniques path 2341 # need to save uniques path
2324 unless ($self->{deny_save}) { 2342 unless ($self->{deny_save}) {
… …
2689 2707
2690sub cf::object::player::goto { 2708sub cf::object::player::goto {
2691 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2692 2710
2693 if ($self->{_link_recursion} >= $MAX_LINKS) { 2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2712 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!"); 2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION; 2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 } 2715 }
2698 2716
2699 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
… …
2847 $self->message ("Something went wrong deep within the deliantra server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2848 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2849 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2850 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2851 2869
2852 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2853 $self->leave_link; 2871 $self->leave_link;
2854 } 2872 }
2855 })->prio (1); 2873 })->prio (1);
2856} 2874}
2857 2875
… …
3170 3188
3171 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
3172 if $reply; 3190 if $reply;
3173 3191
3174 } else { 3192 } else {
3175 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176 } 3194 }
3177 3195
3178 cf::override; 3196 cf::override;
3179 }, 3197 },
3180); 3198);
… …
3261 decrease split destroy change_exp value msg lore send_msg)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3262 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3263 ["cf::player" => qw(peaceful send_msg)], 3281 ["cf::player" => qw(peaceful send_msg)],
3264 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3265) { 3283) {
3266 no strict 'refs';
3267 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269 for @funs; 3286 for @funs;
3270} 3287}
3271 3288
… …
3310 local @cf::_safe_eval_args = values %vars; 3327 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval; 3328 @res = wantarray ? eval eval : scalar eval $eval;
3312 } 3329 }
3313 3330
3314 if ($@) { 3331 if ($@) {
3315 warn "$@"; 3332 warn "$@",
3316 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3317 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3318 } 3335 }
3319 3336
3320 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3321} 3338}
3322 3339
… …
3356 # for this (global event?) 3373 # for this (global event?)
3357 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3358 3375
3359 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360 3377
3361 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3362 3379
3363 my $facedata;
3364 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3365 or die "$path: $!"; 3381 or die "$path: $!";
3366 3382
3367 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3368 3384
3369 $facedata->{version} == 2 3385 $facedata->{version} == 2
… …
3400 3416
3401 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3402 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404 } else { 3420 } else {
3405 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3406 } 3422 }
3407 3423
3408 cf::cede_to_tick; 3424 cf::cede_to_tick;
3409 } 3425 }
3410 } 3426 }
… …
3428 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3429 3445
3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3431 cf::face::set_type $idx, $info->{type}; 3447 cf::face::set_type $idx, $info->{type};
3432 } else { 3448 } else {
3433 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3434 } 3450 }
3435 3451
3436 cf::cede_to_tick; 3452 cf::cede_to_tick;
3437 } 3453 }
3438 } 3454 }
3439 3455
3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3441 3457
3442 1 3458 1
3443} 3459}
3444
3445cf::global->attach (on_resource_update => sub {
3446 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3447 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3448
3449 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3450 my $sound = $soundconf->{compat}[$_]
3451 or next;
3452
3453 my $face = cf::face::find "sound/$sound->[1]";
3454 cf::sound::set $sound->[0] => $face;
3455 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3456 }
3457
3458 while (my ($k, $v) = each %{$soundconf->{event}}) {
3459 my $face = cf::face::find "sound/$v";
3460 cf::sound::set $k => $face;
3461 }
3462 }
3463});
3464 3460
3465register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3466 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3467 3463
3468 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
… …
3507sub reload_treasures { 3503sub reload_treasures {
3508 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3509 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3510} 3506}
3511 3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3512sub reload_resources { 3531sub reload_resources {
3513 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3514 3533
3534 reload_exp_table;
3535 reload_materials;
3515 reload_facedata; 3536 reload_facedata;
3537 reload_sound;
3516 reload_archetypes; 3538 reload_archetypes;
3517 reload_regions; 3539 reload_regions;
3518 reload_treasures; 3540 reload_treasures;
3519 3541
3520 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3521} 3543}
3522 3544
3523sub reload_config { 3545sub reload_config {
3524 warn "reloading config file...\n"; 3546 trace "reloading config file...\n";
3525 3547
3526 open my $fh, "<:utf8", "$CONFDIR/config" 3548 0 < aio_load "$CONFDIR/config", my $config
3527 or return; 3549 or die "$CONFDIR/config: $!";
3528 3550
3529 local $/; 3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3530 *CFG = YAML::XS::Load scalar <$fh>; 3554 *CFG = YAML::XS::Load $config;
3531 3555
3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3533 3557
3534 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3535 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3563 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3540 and die "WARNING: m(un)lockall failed: $!\n"; 3564 and die "WARNING: m(un)lockall failed: $!\n";
3541 }; 3565 };
3542 warn $@ if $@; 3566 warn $@ if $@;
3543 } 3567 }
3544
3545 warn "finished reloading resource files\n";
3546} 3568}
3547 3569
3548sub pidfile() { 3570sub pidfile() {
3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3571 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550 or die "$PIDFILE: $!"; 3572 or die "$PIDFILE: $!";
… …
3563 seek $fh, 0, 0; 3585 seek $fh, 0, 0;
3564 print $fh $$; 3586 print $fh $$;
3565} 3587}
3566 3588
3567sub main_loop { 3589sub main_loop {
3568 warn "EV::loop starting\n"; 3590 trace "EV::loop starting\n";
3569 if (1) { 3591 if (1) {
3570 EV::loop; 3592 EV::loop;
3571 } 3593 }
3572 warn "EV::loop returned\n"; 3594 trace "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP; 3595 goto &main_loop unless $REALLY_UNLOOP;
3574} 3596}
3575 3597
3576sub main { 3598sub main {
3577 cf::init_globals; # initialise logging 3599 cf::init_globals; # initialise logging
3578 3600
3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583 3605
3584 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3585 3607
… …
3593 }; 3615 };
3594 3616
3595 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3596 3618
3597 cf::sync_job { 3619 cf::sync_job {
3598 cf::init_experience; 3620 cf::incloader::init ();
3621
3599 cf::init_anim; 3622 cf::init_anim;
3600 cf::init_attackmess; 3623 cf::init_attackmess;
3601 cf::init_dynamic; 3624 cf::init_dynamic;
3602 3625
3603 cf::load_settings; 3626 cf::load_settings;
3604 cf::load_materials;
3605 3627
3606 reload_resources; 3628 reload_resources;
3607 reload_config; 3629 reload_config;
3608 db_init; 3630 db_init;
3609 3631
… …
3625 3647
3626 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3627 }; 3649 };
3628 3650
3629 cf::object::thawer::errors_are_fatal 0; 3651 cf::object::thawer::errors_are_fatal 0;
3630 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";
3631 3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3632 main_loop; 3659 goto &main_loop;
3633} 3660}
3634 3661
3635############################################################################# 3662#############################################################################
3636# initialisation and cleanup 3663# initialisation and cleanup
3637 3664
… …
3676 or return; 3703 or return;
3677 3704
3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3679 and return; 3706 and return;
3680 3707
3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3682 3709
3683 1 3710 1
3684} 3711}
3685 3712
3686our $uuid_lock; 3713our $uuid_lock;
… …
3698 or return; 3725 or return;
3699 3726
3700 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3701 3728
3702 unless ($value) { 3729 unless ($value) {
3703 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3704 return; 3731 return;
3705 } 3732 }
3706 3733
3707 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3708 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3718 or return; 3745 or return;
3719 3746
3720 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3721 and return; 3748 and return;
3722 3749
3723 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3724 3751
3725 1 3752 1
3726 3753
3727} 3754}
3728 3755
… …
3734} 3761}
3735 3762
3736sub emergency_save() { 3763sub emergency_save() {
3737 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3738 3765
3739 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;
3740 3772
3741 cf::sync_job { 3773 cf::sync_job {
3742 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3743 # save all maps without fsync, and later call a global sync
3744 # (which in turn might be very very slow)
3745 local $USE_FSYNC = 0;
3746 3775
3747 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3748 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3749 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3750 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3751 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3752 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3753 $pl->valid or next; 3782 $pl->valid or next;
3754 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3755 $pl->save; 3784 $pl->save;
3756 } 3785 }
3757 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3758 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3759 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3760 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3761 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3762 $map->valid or next; 3793 $map->valid or next;
3763 $map->save; 3794 $map->save;
3764 } 3795 }
3765 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3766 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3767 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3768 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3769 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3770 3803
3771 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3772 write_uuid_sync 1; 3805 write_uuid_sync 1;
3773 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
3774 }; 3826 };
3775 3827
3776 warn "emergency_perl_save: starting sync()\n";
3777 IO::AIO::aio_sync sub {
3778 warn "emergency_perl_save: finished sync()\n";
3779 };
3780
3781 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3782} 3829}
3783 3830
3784sub post_cleanup { 3831sub post_cleanup {
3785 my ($make_core) = @_; 3832 my ($make_core) = @_;
3786 3833
3834 IO::AIO::flush;
3835
3787 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3788 if $make_core; 3837 if $make_core;
3789 3838
3790 my $fh = pidfile; 3839 my $fh = pidfile;
3791 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3792} 3841}
… …
3816 } 3865 }
3817} 3866}
3818 3867
3819sub do_reload_perl() { 3868sub do_reload_perl() {
3820 # can/must only be called in main 3869 # can/must only be called in main
3821 if (in_main) { 3870 unless (in_main) {
3822 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3823 return; 3872 return;
3824 } 3873 }
3825 3874
3826 return if $RELOAD++; 3875 return if $RELOAD++;
3827 3876
3828 my $t1 = AE::time; 3877 my $t1 = AE::time;
3829 3878
3830 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3831 warn "reloading..."; 3881 info "reloading...";
3832 3882
3833 warn "entering sync_job"; 3883 trace "entering sync_job";
3834 3884
3835 cf::sync_job { 3885 cf::sync_job {
3836 cf::write_runtime_sync; # external watchdog should not bark
3837 cf::emergency_save; 3886 #cf::emergency_save;
3838 cf::write_runtime_sync; # external watchdog should not bark
3839 3887
3840 warn "syncing database to disk";
3841 BDB::db_env_txn_checkpoint $DB_ENV;
3842
3843 # if anything goes wrong in here, we should simply crash as we already saved
3844
3845 warn "flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3851 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3852 %EXT_CORO = (); 3890 %EXT_CORO = ();
3853 3891
3854 warn "removing commands"; 3892 trace "removing commands";
3855 %COMMAND = (); 3893 %COMMAND = ();
3856 3894
3857 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3858 %EXTCMD = (); 3896 %EXTCMD = ();
3859 %EXTICMD = (); 3897 %EXTICMD = ();
3860 3898
3861 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3862 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3863 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3864 3902
3865 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3866 eval { 3904 eval {
3867 $cb->($pkg); 3905 $cb->($pkg);
3868 1 3906 1
3869 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3870 } 3908 }
3871 3909
3872 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3873 clear_package $pkg; 3911 clear_package $pkg;
3874 } 3912 }
3875 3913
3876 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3877 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3878 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879 3917
3880 warn "... unloading $k"; 3918 trace "... unloading $k";
3881 delete $INC{$k}; 3919 delete $INC{$k};
3882 3920
3883 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3884 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3885 3923
… …
3888 } 3926 }
3889 3927
3890 clear_package $k; 3928 clear_package $k;
3891 } 3929 }
3892 3930
3893 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3894 clear_package "safe::$_" 3932 clear_package "safe::$_"
3895 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);
3896 3934
3897 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3898 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3900 3938
3901 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3902 # and global variables created in xs 3940 # and global variables created in xs
3903 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3904 3942
3905 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3906 3944
3907 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3908 require cf; 3946 require cf;
3909 cf::_connect_to_perl_1; 3947 cf::_connect_to_perl_1;
3910 3948
3911 warn "loading config and database again"; 3949 trace "loading config and database again";
3912 cf::reload_config; 3950 cf::reload_config;
3913 3951
3914 warn "loading extensions"; 3952 trace "loading extensions";
3915 cf::load_extensions; 3953 cf::load_extensions;
3916 3954
3917 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3918 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3919 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3920 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3921 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3922 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3923 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3924 } 3962 }
3925 3963
3926 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3927 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3928 3966
3929 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3930 3968
3931 1 3969 1
3932 } or do { 3970 } or do {
3933 warn $@; 3971 error $@;
3934 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3935 }; 3973 };
3936 3974
3937 warn "reloaded"; 3975 info "reloaded";
3938 --$RELOAD; 3976 --$RELOAD;
3939 } 3977 }
3940 3978
3941 $t1 = AE::time - $t1; 3979 $t1 = AE::time - $t1;
3942 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3943}; 3981};
3944 3982
3945our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3946 3984
3947sub reload_perl() { 3985sub reload_perl() {
… …
3968 reload_perl; 4006 reload_perl;
3969 }; 4007 };
3970 } 4008 }
3971}; 4009};
3972 4010
3973unshift @INC, $LIBDIR; 4011#############################################################################
3974 4012
3975my $bug_warning = 0; 4013my $bug_warning = 0;
3976 4014
3977our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3978our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3979 4017
3980sub wait_for_tick { 4018sub wait_for_tick() {
3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3982 4020
3983 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3984 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3985 $signal->wait; 4023 $signal->wait;
3986} 4024}
3987 4025
3988sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3990 4028
3991 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3992 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3993 $signal->wait; 4031 $signal->wait;
… …
4007 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4008 $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.;
4009 Coro::async_pool { 4047 Coro::async_pool {
4010 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
4011 write_runtime_sync 4049 write_runtime_sync
4012 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
4013 }; 4051 };
4014 } 4052 }
4015 4053
4016 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4017 $sig->send; 4055 $sig->send;
… …
4025 4063
4026 if (0) { 4064 if (0) {
4027 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
4028 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
4029 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
4031 } 4069 }
4032 } 4070 }
4033} 4071}
4034 4072
4035{ 4073{

Diff Legend

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