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.337 by root, Tue Aug 21 00:54:01 2007 UTC vs.
Revision 1.384 by root, Fri Oct 12 18:17:16 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.64 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 93our $RUNTIME;
91 94
92our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
96# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 101
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
272Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
275returned. 277returned.
276 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
277Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
279 284
280=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
281 286
282Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
283 288
284=cut 289=cut
285 290
286our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
287 293
288sub lock_wait($) { 294sub lock_wait($) {
289 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
290 301
291 # wait for lock, if any 302 # wait for lock, if any
292 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 305 Coro::schedule;
… …
300 311
301 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
302 lock_wait $key; 313 lock_wait $key;
303 314
304 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
305 317
306 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
309 } 322 }
310} 323}
311 324
… …
341our @SLOT_QUEUE; 354our @SLOT_QUEUE;
342our $SLOT_QUEUE; 355our $SLOT_QUEUE;
343 356
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
346 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
347 362
348 while () { 363 while () {
349 next_job: 364 next_job:
350 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
358 } 373 }
359 } 374 }
360 } 375 }
361 376
362 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 380 $signal->wait;
366 } else { 381 } else {
367 Coro::schedule; 382 Coro::schedule;
368 } 383 }
… …
412 my $time = Event::time; 427 my $time = Event::time;
413 428
414 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
416 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
417 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 435 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
420 437
421 my $busy = 1; 438 my $busy = 1;
422 my @res; 439 my @res;
423 440
424 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 443 @res = eval { $job->() };
426 warn $@ if $@; 444 warn $@ if $@;
427 undef $busy; 445 undef $busy;
428 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
429 447
… …
478sub fork_call(&@) { 496sub fork_call(&@) {
479 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
480 498
481 # we seemingly have to make a local copy of the whole thing, 499 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 500 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 501 # TODO: investigate and fix (likely this will be rather laborious)
484 502
485 my @res = Coro::Util::fork_eval { 503 my @res = Coro::Util::fork_eval {
486 reset_signals; 504 reset_signals;
487 &$cb 505 &$cb
488 }, @args; 506 }, @args;
… …
497=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
498 516
499Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
502=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
503 543
504our $DB; 544our $DB;
505 545
506sub db_init { 546sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 547 cf::sync_job {
511 eval { 548 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 549 };
521} 550}
522 551
523sub db_get($$) { 552sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
525 554
… …
575 if (1) { 604 if (1) {
576 $md5 = 605 $md5 =
577 join "\x00", 606 join "\x00",
578 $processversion, 607 $processversion,
579 map { 608 map {
580 Coro::cede; 609 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 611 } 0.. $#$src;
583 612
584 613
585 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
… …
1004sub object_freezer_save { 1033sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1006 1035
1007 sync_job { 1036 sync_job {
1008 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1011 1041
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1046 close $fh;
1017 1047
1018 if (@$objs) { 1048 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1054 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1056 }
… …
1034 } 1064 }
1035 } else { 1065 } else {
1036 aio_unlink $filename; 1066 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1038 } 1068 }
1039 } 1069 };
1040} 1070}
1041 1071
1042sub object_freezer_as_string { 1072sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1044 1074
… …
1056 or return; 1086 or return;
1057 1087
1058 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1090 or return;
1061 $av = eval { (Storable::thaw $av)->{objs} };
1062 }
1063 1091
1092 my $st = eval { Coro::Storable::thaw $av }
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs};
1095 }
1096
1097 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1066 return ($data, $av); 1101 ($data, $av)
1067} 1102}
1068 1103
1069=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1070 1105
1071=over 4 1106=over 4
… …
1149 my ($type, $reply, @payload) = 1184 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1185 "ARRAY" eq ref $msg
1151 ? @$msg 1186 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1188
1189 my @reply;
1190
1154 if (my $cb = $EXTCMD{$type}) { 1191 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1192 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1160 } else { 1198 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1200 }
1163 1201
1164 cf::override; 1202 cf::override;
… …
1254 1292
1255=head3 cf::player 1293=head3 cf::player
1256 1294
1257=over 4 1295=over 4
1258 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1259=item cf::player::find $login 1311=item cf::player::find $login
1260 1312
1261Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1262 1314
1263=cut 1315=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1354
1303 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1306 } 1363 }
1307 } 1364 }
1308} 1365}
1309 1366
… …
1319 1376
1320 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1322 1379
1323 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1324 Coro::cede; 1381 cf::cede_to_tick;
1325} 1382}
1326 1383
1327sub new($) { 1384sub new($) {
1328 my ($login) = @_; 1385 my ($login) = @_;
1329 1386
… …
1407 or return []; 1464 or return [];
1408 1465
1409 my @logins; 1466 my @logins;
1410 1467
1411 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1415 1477
1416 utf8::decode $login; 1478 utf8::decode $login;
1417 push @logins, $login; 1479 push @logins, $login;
1418 } 1480 }
1419 1481
… …
1457sub expand_cfpod { 1519sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1459 1521
1460 # escape & and < 1522 # escape & and <
1461 s/&/&amp;/g; 1523 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1463 1525
1464 # this is buggy, it needs to properly take care of nested <'s 1526 # this is buggy, it needs to properly take care of nested <'s
1465 1527
1466 1 while 1528 1 while
1467 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1534 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1474 }ge 1537 }ge
1475 # replace H<hint text> 1538 # replace H<hint text>
… …
1743 1806
1744sub load_header_from($) { 1807sub load_header_from($) {
1745 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1746 1809
1747 utf8::encode $path; 1810 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1753 1819
1754 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1755 1821
1756 1 1822 1
1757} 1823}
… …
1811sub find { 1877sub find {
1812 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1813 1879
1814 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1815 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1817 1884
1818 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1819 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1820 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1821 or return; 1890 or return;
1822 1891
1823 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1824 1893
… …
1826 or return; 1895 or return;
1827 1896
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1831 $map->reset; 1902 $map->reset;
1832 undef $guard;
1833 return find $path; 1903 return find $path;
1834 } 1904 }
1835 1905
1836 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1837 } 1907 }
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1847 1917
1848 my $path = $self->{path}; 1918 my $path = $self->{path};
1849 1919
1850 { 1920 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1852 1922
1923 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 1925
1855 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1856 1927
1857 $self->alloc; 1928 $self->alloc;
1858 1929
1859 $self->pre_load; 1930 $self->pre_load;
1860 Coro::cede; 1931 cf::cede_to_tick;
1861 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1863 or return; 1936 or return;
1864 1937
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1867 1940
1868 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 1942 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 1945 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1873 } 1949 }
1874 } 1950 }
1875 1951
1876 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1877 # now do the right thing for maps 1955 # now do the right thing for maps
1878 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 1958 unless $self->difficulty;
1881 Coro::cede; 1959 cf::cede_to_tick;
1882 1960
1883 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 1962 $self->decay_objects;
1885 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1886 $self->update_buttons; 1964 $self->update_buttons;
1887 Coro::cede; 1965 cf::cede_to_tick;
1888 $self->set_darkness_map; 1966 $self->set_darkness_map;
1889 Coro::cede; 1967 cf::cede_to_tick;
1890 $self->activate; 1968 $self->activate;
1891 } 1969 }
1892 1970
1893 $self->{last_save} = $cf::RUNTIME; 1971 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 1972 $self->last_access ($cf::RUNTIME);
… …
1944} 2022}
1945 2023
1946sub do_load_sync { 2024sub do_load_sync {
1947 my ($map) = @_; 2025 my ($map) = @_;
1948 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1949 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1950} 2031}
1951 2032
1952our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1954 2035
1955sub find_async { 2036sub find_async {
1956 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1957 2038
1958 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1959 2040
1960 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2043 }
1963 2044
1964 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1965 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
1966 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2052 if (my $map = find $k) {
1969 $map->load; 2053 $map->load if $v;
1970 } 2054 }
1971 2055
1972 delete $MAP_PREFETCH{$path}; 2056 delete $MAP_PREFETCH{$k};
1973 } 2057 }
1974 } 2058 }
1975 undef $MAP_PREFETCHER; 2059 undef $MAP_PREFETCHER;
1976 }; 2060 };
1977 $MAP_PREFETCHER->prio (6); 2061 $MAP_PREFETCHER->prio (6);
… …
1980} 2064}
1981 2065
1982sub save { 2066sub save {
1983 my ($self) = @_; 2067 my ($self) = @_;
1984 2068
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2070
1987 $self->{last_save} = $cf::RUNTIME; 2071 $self->{last_save} = $cf::RUNTIME;
1988 2072
1989 return unless $self->dirty; 2073 return unless $self->dirty;
1990 2074
… …
1996 return if $self->{deny_save}; 2080 return if $self->{deny_save};
1997 2081
1998 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
1999 2083
2000 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
2002 }; 2087 };
2003 2088
2004 if ($uniq) { 2089 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2013 my ($self) = @_; 2098 my ($self) = @_;
2014 2099
2015 # save first because save cedes 2100 # save first because save cedes
2016 $self->save; 2101 $self->save;
2017 2102
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2104
2020 return if $self->players; 2105 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2107 return if $self->{deny_save};
2023 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2113 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2114}
2027 2115
2028sub reset_at { 2116sub reset_at {
2029 my ($self) = @_; 2117 my ($self) = @_;
2030 2118
… …
2062 if $uniq; 2150 if $uniq;
2063 } 2151 }
2064 2152
2065 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
2066 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2157 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2158
2071 $self->unlink_save; 2159 $self->unlink_save;
2072 $self->destroy; 2160 $self->destroy;
2073} 2161}
2074 2162
2075my $nuke_counter = "aaaa"; 2163my $nuke_counter = "aaaa";
2076 2164
2077sub nuke { 2165sub nuke {
2078 my ($self) = @_; 2166 my ($self) = @_;
2079 2167
2168 {
2169 my $lock = cf::lock_acquire "map_data:$self->{path}";
2170
2080 delete $cf::MAP{$self->path}; 2171 delete $cf::MAP{$self->path};
2081 2172
2082 $self->unlink_save; 2173 $self->unlink_save;
2083 2174
2084 bless $self, "cf::map"; 2175 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2176 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2177 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2178 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2180
2090 $cf::MAP{$self->path} = $self; 2181 $cf::MAP{$self->path} = $self;
2182 }
2091 2183
2092 $self->reset; # polite request, might not happen 2184 $self->reset; # polite request, might not happen
2093} 2185}
2094 2186
2095=item $maps = cf::map::tmp_maps 2187=item $maps = cf::map::tmp_maps
… …
2171 2263
2172sub inv_recursive { 2264sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2174} 2266}
2175 2267
2268=item $ref = $ob->ref
2269
2270creates and returns a persistent reference to an objetc that can be stored as a string.
2271
2272=item $ob = cf::object::deref ($refstring)
2273
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block.
2276
2277=cut
2278
2279sub deref {
2280 my ($ref) = @_;
2281
2282 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2176package cf; 2296package cf;
2177 2297
2178=back 2298=back
2179 2299
2180=head3 cf::object::player 2300=head3 cf::object::player
… …
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2459
2340 $self->enter_link; 2460 $self->enter_link;
2341 2461
2342 (async { 2462 (async {
2463 $Coro::current->{desc} = "player::goto $path $x $y";
2464
2465 # *tag paths override both path and x|y
2466 if ($path =~ /^\*(.*)$/) {
2467 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2468 my $ob = $obs[rand @obs];
2469
2470 # see if we actually can go there
2471 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2472 $ob = $obs[rand @obs];
2473 } else {
2474 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2475 }
2476 # else put us there anyways for now #d#
2477
2478 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2479 } else {
2480 ($path, $x, $y) = (undef, undef, undef);
2481 }
2482 }
2483
2343 my $map = eval { 2484 my $map = eval {
2344 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2345 2486
2346 if ($map) { 2487 if ($map) {
2347 $map = $map->customise_for ($self); 2488 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2489 $map = $check->($map) if $check && $map;
2349 } else { 2490 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2491 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351 } 2492 }
2352 2493
2353 $map 2494 $map
2354 }; 2495 };
2355 2496
… …
2445 # if exit is damned, update players death & WoR home-position 2586 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp) 2587 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED); 2588 if $exit->flag (FLAG_DAMNED);
2448 2589
2449 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2450 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2451 unless (eval { 2594 unless (eval {
2452 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2453 2596
2454 1; 2597 1;
… …
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2632the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2633the message unless the client supports the msg packet.
2491 2634
2492=cut 2635=cut
2493 2636
2637our %CHANNEL = (
2638 "c/identify" => {
2639 id => "infobox",
2640 title => "Identify",
2641 reply => undef,
2642 tooltip => "Items recently identified",
2643 },
2644 "c/examine" => {
2645 id => "infobox",
2646 title => "Examine",
2647 reply => undef,
2648 tooltip => "Signs and other items you examined",
2649 },
2650 "c/lookat" => {
2651 id => "infobox",
2652 title => "Look",
2653 reply => undef,
2654 tooltip => "What you saw there",
2655 },
2656);
2657
2494sub cf::client::send_msg { 2658sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2659 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2660
2497 $msg = $self->pl->expand_cfpod ($msg); 2661 $msg = $self->pl->expand_cfpod ($msg);
2498 2662
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 2664
2665 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel};
2668
2669 $self->ext_msg (channel_info => $channel)
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id};
2673
2501 if (ref $channel) { 2674 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 2675 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2676 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2677 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2678 $self->ext_msg (channel_info => $channel)
2679 if $self->can_msg;
2506 } 2680 }
2507 2681
2508 $channel = $channel->{id}; 2682 $channel = $channel->{id};
2509 } 2683 }
2510 2684
… …
2551=cut 2725=cut
2552 2726
2553sub cf::client::ext_msg($$@) { 2727sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2728 my ($self, $type, @msg) = @_;
2555 2729
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2730 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2732 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2733 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2735 }
2564} 2736}
2565 2737
… …
2572sub cf::client::ext_reply($$@) { 2744sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2745 my ($self, $id, @msg) = @_;
2574 2746
2575 if ($self->extcmd == 2) { 2747 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2749 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2750 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2751 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2753 }
2582} 2754}
… …
2646 my ($type, $reply, @payload) = 2818 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2819 "ARRAY" eq ref $msg
2648 ? @$msg 2820 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2821 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2822
2823 my @reply;
2824
2651 if (my $cb = $EXTICMD{$type}) { 2825 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2826 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2827 }
2828
2829 $ns->ext_reply ($reply, @reply)
2830 if $reply;
2831
2657 } else { 2832 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2833 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2834 }
2660 2835
2661 cf::override; 2836 cf::override;
… …
2721=pod 2896=pod
2722 2897
2723The following functions and methods are available within a safe environment: 2898The following functions and methods are available within a safe environment:
2724 2899
2725 cf::object 2900 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 2901 contr pay_amount pay_player map x y force_find force_add destroy
2727 insert remove name archname title slaying race 2902 insert remove name archname title slaying race decrease_ob_nr
2728 2903
2729 cf::object::player 2904 cf::object::player
2730 player 2905 player
2731 2906
2732 cf::player 2907 cf::player
… …
2737 2912
2738=cut 2913=cut
2739 2914
2740for ( 2915for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 2917 insert remove inv name archname title slaying race
2918 decrease_ob_nr destroy)],
2743 ["cf::object::player" => qw(player)], 2919 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2920 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2921 ["cf::map" => qw(trigger)],
2746) { 2922) {
2747 no strict 'refs'; 2923 no strict 'refs';
… …
2823# the server's init and main functions 2999# the server's init and main functions
2824 3000
2825sub load_facedata($) { 3001sub load_facedata($) {
2826 my ($path) = @_; 3002 my ($path) = @_;
2827 3003
3004 # HACK to clear player env face cache, we need some signal framework
3005 # for this (global event?)
3006 %ext::player_env::MUSIC_FACE_CACHE = ();
3007
2828 my $enc = JSON::XS->new->utf8->canonical; 3008 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3009
2830 warn "loading facedata from $path\n"; 3010 warn "loading facedata from $path\n";
2831 3011
2832 my $facedata; 3012 my $facedata;
2833 0 < aio_load $path, $facedata 3013 0 < aio_load $path, $facedata
… …
2943 $ns->fx_want ($k, $v); 3123 $ns->fx_want ($k, $v);
2944 } 3124 }
2945}; 3125};
2946 3126
2947sub reload_regions { 3127sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
2948 load_resource_file "$MAPDIR/regions" 3132 load_resource_file "$MAPDIR/regions"
2949 or die "unable to load regions file\n"; 3133 or die "unable to load regions file\n";
2950 3134
2951 for (cf::region::list) { 3135 for (cf::region::list) {
2952 $_->{match} = qr/$_->{match}/ 3136 $_->{match} = qr/$_->{match}/
… …
2988 3172
2989sub init { 3173sub init {
2990 reload_resources; 3174 reload_resources;
2991} 3175}
2992 3176
2993sub cfg_load { 3177sub reload_config {
2994 open my $fh, "<:utf8", "$CONFDIR/config" 3178 open my $fh, "<:utf8", "$CONFDIR/config"
2995 or return; 3179 or return;
2996 3180
2997 local $/; 3181 local $/;
2998 *CFG = YAML::Syck::Load <$fh>; 3182 *CFG = YAML::Syck::Load <$fh>;
… …
3014sub main { 3198sub main {
3015 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
3016 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
3017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3018 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
3019 Event::one_event; 3204 Event::one_event;
3020 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
3021 }; 3206 };
3022 3207
3023 cfg_load; 3208 reload_config;
3024 db_init; 3209 db_init;
3025 load_extensions; 3210 load_extensions;
3026 3211
3027 $TICK_WATCHER->start; 3212 $TICK_WATCHER->start;
3028 Event::loop; 3213 Event::loop;
… …
3095 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
3096 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
3097 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
3098 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
3099 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3100 $pl->save; 3286 $pl->save;
3101 } 3287 }
3102 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
3103 3289
3104 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
… …
3221 warn "reloading cf.pm"; 3407 warn "reloading cf.pm";
3222 require cf; 3408 require cf;
3223 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3224 3410
3225 warn "loading config and database again"; 3411 warn "loading config and database again";
3226 cf::cfg_load; 3412 cf::reload_config;
3227 3413
3228 warn "loading extensions"; 3414 warn "loading extensions";
3229 cf::load_extensions; 3415 cf::load_extensions;
3230 3416
3231 warn "reattaching attachments to objects/players"; 3417 warn "reattaching attachments to objects/players";
… …
3267register_command "reload" => sub { 3453register_command "reload" => sub {
3268 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
3269 3455
3270 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
3271 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
3272 async { reload_perl }; 3460 reload_perl;
3461 };
3273 } 3462 }
3274}; 3463};
3275 3464
3276unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
3277 3466
… …
3296 my $signal = new Coro::Signal; 3485 my $signal = new Coro::Signal;
3297 push @WAIT_FOR_TICK_BEGIN, $signal; 3486 push @WAIT_FOR_TICK_BEGIN, $signal;
3298 $signal->wait; 3487 $signal->wait;
3299} 3488}
3300 3489
3301 my $min = 1e6;#d#
3302 my $avg = 10;
3303$TICK_WATCHER = Event->timer ( 3490$TICK_WATCHER = Event->timer (
3304 reentrant => 0, 3491 reentrant => 0,
3305 parked => 1, 3492 parked => 1,
3306 prio => 0, 3493 prio => 0,
3307 at => $NEXT_TICK || $TICK, 3494 at => $NEXT_TICK || $TICK,
… …
3315 3502
3316 $NOW = $tick_start = Event::time; 3503 $NOW = $tick_start = Event::time;
3317 3504
3318 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
3319 3506
3320 0 && sync_job {#d#
3321 for(1..10) {
3322 my $t = Event::time;
3323 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3324 or die;
3325
3326 $map->width (50);
3327 $map->height (50);
3328 $map->alloc;
3329 $map->_load_objects ("/tmp/x.map", 1);
3330 my $t = Event::time - $t;
3331
3332 #next unless $t < 0.0013;#d#
3333 if ($t < $min) {
3334 $min = $t;
3335 }
3336 $avg = $avg * 0.99 + $t * 0.01;
3337 }
3338 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3339 exit 0;
3340 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3341 };
3342
3343 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
3344 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
3345 3509
3346 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3347 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
3348 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
3349 write_runtime 3514 write_runtime
3350 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
3351 }; 3516 };
3352 } 3517 }
3353 3518
3354# my $AFTER = Event::time;
3355# warn $AFTER - $NOW;#d#
3356
3357 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3358 $sig->send; 3520 $sig->send;
3359 } 3521 }
3360 while (my $sig = shift @WAIT_FOR_TICK) { 3522 while (my $sig = shift @WAIT_FOR_TICK) {
3361 $sig->send; 3523 $sig->send;
… …
3371 3533
3372 $LOAD = ($NOW - $tick_start) / $TICK; 3534 $LOAD = ($NOW - $tick_start) / $TICK;
3373 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3374 3536
3375 _post_tick; 3537 _post_tick;
3376
3377
3378 }, 3538 },
3379); 3539);
3380 3540
3381{ 3541{
3542 BDB::min_parallel 8;
3382 BDB::max_poll_time $TICK * 0.1; 3543 BDB::max_poll_time $TICK * 0.1;
3383 $BDB_POLL_WATCHER = Event->io ( 3544 $BDB_POLL_WATCHER = Event->io (
3384 reentrant => 0, 3545 reentrant => 0,
3385 fd => BDB::poll_fileno, 3546 fd => BDB::poll_fileno,
3386 poll => 'r', 3547 poll => 'r',
3387 prio => 0, 3548 prio => 0,
3388 data => WF_AUTOCANCEL, 3549 data => WF_AUTOCANCEL,
3389 cb => \&BDB::poll_cb, 3550 cb => \&BDB::poll_cb,
3390 ); 3551 );
3391 BDB::min_parallel 8;
3392 3552
3393 BDB::set_sync_prepare { 3553 BDB::set_sync_prepare {
3394 my $status; 3554 my $status;
3395 my $current = $Coro::current; 3555 my $current = $Coro::current;
3396 ( 3556 (
… …
3405 ) 3565 )
3406 }; 3566 };
3407 3567
3408 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
3409 $DB_ENV = BDB::db_env_create; 3569 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1);
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3410 3574
3411 cf::sync_job { 3575 cf::sync_job {
3412 eval { 3576 eval {
3413 BDB::db_env_open 3577 BDB::db_env_open
3414 $DB_ENV, 3578 $DB_ENV,
… …
3416 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3580 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3417 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3418 0666; 3582 0666;
3419 3583
3420 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3421
3422 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3423 $DB_ENV->set_lk_detect;
3424 }; 3585 };
3425 3586
3426 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
3427 }; 3588 };
3428 } 3589 }
3590
3591 $BDB_DEADLOCK_WATCHER = Event->timer (
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 );
3601 $BDB_CHECKPOINT_WATCHER = Event->timer (
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 );
3611 $BDB_TRICKLE_WATCHER = Event->timer (
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 );
3429} 3621}
3430 3622
3431{ 3623{
3432 IO::AIO::min_parallel 8; 3624 IO::AIO::min_parallel 8;
3433 3625
… …
3436 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
3437 reentrant => 0, 3629 reentrant => 0,
3438 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
3439 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
3440 poll => 'r', 3632 poll => 'r',
3441 prio => 6, 3633 prio => 0,
3442 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
3443 ); 3635 );
3444} 3636}
3445 3637
3446my $_log_backtrace; 3638my $_log_backtrace;
… …
3452 3644
3453 # limit the # of concurrent backtraces 3645 # limit the # of concurrent backtraces
3454 if ($_log_backtrace < 2) { 3646 if ($_log_backtrace < 2) {
3455 ++$_log_backtrace; 3647 ++$_log_backtrace;
3456 async { 3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3457 my @bt = fork_call { 3651 my @bt = fork_call {
3458 @addr = map { sprintf "%x", $_ } @addr; 3652 @addr = map { sprintf "%x", $_ } @addr;
3459 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3460 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3654 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3461 or die "addr2line: $!"; 3655 or die "addr2line: $!";

Diff Legend

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