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.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.390 by root, Thu Oct 25 09:01:24 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
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, 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
430 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
431 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
432 } 454 }
433 455
434 $time = Event::time - $time; 456 $time = Event::time - $time;
435 457
436 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
478sub fork_call(&@) { 500sub fork_call(&@) {
479 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
480 502
481 # we seemingly have to make a local copy of the whole thing, 503 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 504 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 505 # TODO: investigate and fix (likely this will be rather laborious)
484 506
485 my @res = Coro::Util::fork_eval { 507 my @res = Coro::Util::fork_eval {
486 reset_signals; 508 reset_signals;
487 &$cb 509 &$cb
488 }, @args; 510 }, @args;
… …
497=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
498 520
499Stores the given C<$value> in the family. It can currently store binary 521Stores 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). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
502=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
503 547
504our $DB; 548our $DB;
505 549
506sub db_init { 550sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 551 cf::sync_job {
511 eval { 552 $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 } 553 };
521} 554}
522 555
523sub db_get($$) { 556sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
525 558
… …
575 if (1) { 608 if (1) {
576 $md5 = 609 $md5 =
577 join "\x00", 610 join "\x00",
578 $processversion, 611 $processversion,
579 map { 612 map {
580 Coro::cede; 613 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 615 } 0.. $#$src;
583 616
584 617
585 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
… …
937 970
938=cut 971=cut
939 972
940############################################################################# 973#############################################################################
941# object support 974# object support
942#
943 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
944sub _can_merge { 1009sub _can_merge {
945 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
946 1011
947 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1013
951 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
952} 1016}
953 1017
954sub reattach { 1018sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1004sub object_freezer_save { 1068sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1006 1070
1007 sync_job { 1071 sync_job {
1008 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1011 1076
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1081 close $fh;
1017 1082
1018 if (@$objs) { 1083 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1089 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1091 }
… …
1034 } 1099 }
1035 } else { 1100 } else {
1036 aio_unlink $filename; 1101 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1038 } 1103 }
1039 } 1104 };
1040} 1105}
1041 1106
1042sub object_freezer_as_string { 1107sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1044 1109
… …
1056 or return; 1121 or return;
1057 1122
1058 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1125 or return;
1126
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1062 } 1129 }
1063 1130
1131 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1066 return ($data, $av); 1135 ($data, $av)
1067} 1136}
1068 1137
1069=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1070 1139
1071=over 4 1140=over 4
… …
1257 1326
1258=head3 cf::player 1327=head3 cf::player
1259 1328
1260=over 4 1329=over 4
1261 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1262=item cf::player::find $login 1345=item cf::player::find $login
1263 1346
1264Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1265 1348
1266=cut 1349=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1388
1306 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1309 } 1397 }
1310 } 1398 }
1311} 1399}
1312 1400
… …
1322 1410
1323 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1325 1413
1326 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1327 Coro::cede; 1415 cf::cede_to_tick;
1328} 1416}
1329 1417
1330sub new($) { 1418sub new($) {
1331 my ($login) = @_; 1419 my ($login) = @_;
1332 1420
… …
1410 or return []; 1498 or return [];
1411 1499
1412 my @logins; 1500 my @logins;
1413 1501
1414 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1418 1511
1419 utf8::decode $login; 1512 utf8::decode $login;
1420 push @logins, $login; 1513 push @logins, $login;
1421 } 1514 }
1422 1515
… …
1460sub expand_cfpod { 1553sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1554 ((my $self), (local $_)) = @_;
1462 1555
1463 # escape & and < 1556 # escape & and <
1464 s/&/&amp;/g; 1557 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1558 s/(?<![BIUGHT])</&lt;/g;
1466 1559
1467 # this is buggy, it needs to properly take care of nested <'s 1560 # this is buggy, it needs to properly take care of nested <'s
1468 1561
1469 1 while 1562 1 while
1470 # replace B<>, I<>, U<> etc. 1563 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1564 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1568 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1569 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1570 $self->gender ? $2 : $1
1477 }ge 1571 }ge
1478 # replace H<hint text> 1572 # replace H<hint text>
… …
1746 1840
1747sub load_header_from($) { 1841sub load_header_from($) {
1748 my ($self, $path) = @_; 1842 my ($self, $path) = @_;
1749 1843
1750 utf8::encode $path; 1844 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1845 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1846 or return;
1847
1848 $self->_load_header ($f)
1849 or return;
1850
1851 local $MAP_LOADING{$self->{path}} = $self;
1852 $f->resolve_delayed_derefs;
1756 1853
1757 $self->{load_path} = $path; 1854 $self->{load_path} = $path;
1758 1855
1759 1 1856 1
1760} 1857}
… …
1814sub find { 1911sub find {
1815 my ($path, $origin) = @_; 1912 my ($path, $origin) = @_;
1816 1913
1817 $path = normalise $path, $origin && $origin->path; 1914 $path = normalise $path, $origin && $origin->path;
1818 1915
1916 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1917 cf::lock_wait "map_find:$path";
1820 1918
1821 $cf::MAP{$path} || do { 1919 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1823 my $map = new_from_path cf::map $path 1923 my $map = new_from_path cf::map $path
1824 or return; 1924 or return;
1825 1925
1826 $map->{last_save} = $cf::RUNTIME; 1926 $map->{last_save} = $cf::RUNTIME;
1827 1927
… …
1829 or return; 1929 or return;
1830 1930
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1932 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1933 #$cf::WAIT_FOR_TICK->wait;
1934 undef $guard1;
1935 undef $guard2;
1834 $map->reset; 1936 $map->reset;
1835 undef $guard;
1836 return find $path; 1937 return find $path;
1837 } 1938 }
1838 1939
1839 $cf::MAP{$path} = $map 1940 $cf::MAP{$path} = $map
1840 } 1941 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1950 local $self->{deny_reset} = 1; # loading can take a long time
1850 1951
1851 my $path = $self->{path}; 1952 my $path = $self->{path};
1852 1953
1853 { 1954 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1955 my $guard = cf::lock_acquire "map_data:$path";
1855 1956
1957 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1958 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 1959
1858 $self->in_memory (cf::MAP_LOADING); 1960 $self->in_memory (cf::MAP_LOADING);
1859 1961
1860 $self->alloc; 1962 $self->alloc;
1861 1963
1862 $self->pre_load; 1964 $self->pre_load;
1863 Coro::cede; 1965 cf::cede_to_tick;
1864 1966
1967 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 1969 $self->_load_objects ($f)
1866 or return; 1970 or return;
1867 1971
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 1973 if delete $self->{load_original};
1870 1974
1871 if (my $uniq = $self->uniq_path) { 1975 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 1976 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 1977 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 1979 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1980 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs;
1982 }
1876 } 1983 }
1877 } 1984 }
1878 1985
1879 Coro::cede; 1986 $f->resolve_delayed_derefs;
1987
1988 cf::cede_to_tick;
1880 # now do the right thing for maps 1989 # now do the right thing for maps
1881 $self->link_multipart_objects; 1990 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1991 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1992 unless $self->difficulty;
1884 Coro::cede; 1993 cf::cede_to_tick;
1885 1994
1886 unless ($self->{deny_activate}) { 1995 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1996 $self->decay_objects;
1888 $self->fix_auto_apply; 1997 $self->fix_auto_apply;
1889 $self->update_buttons; 1998 $self->update_buttons;
1890 Coro::cede; 1999 cf::cede_to_tick;
1891 $self->set_darkness_map; 2000 $self->set_darkness_map;
1892 Coro::cede; 2001 cf::cede_to_tick;
1893 $self->activate; 2002 $self->activate;
1894 } 2003 }
1895 2004
1896 $self->{last_save} = $cf::RUNTIME; 2005 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2006 $self->last_access ($cf::RUNTIME);
… …
1947} 2056}
1948 2057
1949sub do_load_sync { 2058sub do_load_sync {
1950 my ($map) = @_; 2059 my ($map) = @_;
1951 2060
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main;
2063
1952 cf::sync_job { $map->load }; 2064 cf::sync_job { $map->load };
1953} 2065}
1954 2066
1955our %MAP_PREFETCH; 2067our %MAP_PREFETCH;
1956our $MAP_PREFETCHER = undef; 2068our $MAP_PREFETCHER = undef;
1957 2069
1958sub find_async { 2070sub find_async {
1959 my ($path, $origin) = @_; 2071 my ($path, $origin, $load) = @_;
1960 2072
1961 $path = normalise $path, $origin && $origin->{path}; 2073 $path = normalise $path, $origin && $origin->{path};
1962 2074
1963 if (my $map = $cf::MAP{$path}) { 2075 if (my $map = $cf::MAP{$path}) {
1964 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1965 } 2077 }
1966 2078
1967 undef $MAP_PREFETCH{$path}; 2079 $MAP_PREFETCH{$path} |= $load;
2080
1968 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
1969 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
1970 for my $path (keys %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
1971 if (my $map = find $path) { 2086 if (my $map = find $k) {
1972 $map->load; 2087 $map->load if $v;
1973 } 2088 }
1974 2089
1975 delete $MAP_PREFETCH{$path}; 2090 delete $MAP_PREFETCH{$k};
1976 } 2091 }
1977 } 2092 }
1978 undef $MAP_PREFETCHER; 2093 undef $MAP_PREFETCHER;
1979 }; 2094 };
1980 $MAP_PREFETCHER->prio (6); 2095 $MAP_PREFETCHER->prio (6);
… …
1983} 2098}
1984 2099
1985sub save { 2100sub save {
1986 my ($self) = @_; 2101 my ($self) = @_;
1987 2102
1988 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1989 2104
1990 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1991 2106
1992 return unless $self->dirty; 2107 return unless $self->dirty;
1993 2108
… …
1999 return if $self->{deny_save}; 2114 return if $self->{deny_save};
2000 2115
2001 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
2002 2117
2003 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
2004 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
2005 }; 2121 };
2006 2122
2007 if ($uniq) { 2123 if ($uniq) {
2008 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2016 my ($self) = @_; 2132 my ($self) = @_;
2017 2133
2018 # save first because save cedes 2134 # save first because save cedes
2019 $self->save; 2135 $self->save;
2020 2136
2021 my $lock = cf::lock_acquire "map_data:" . $self->path; 2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2022 2138
2023 return if $self->players; 2139 return if $self->players;
2024 return if $self->in_memory != cf::MAP_IN_MEMORY; 2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2025 return if $self->{deny_save}; 2141 return if $self->{deny_save};
2026 2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2027 $self->clear; 2147 $self->clear;
2028 $self->in_memory (cf::MAP_SWAPPED);
2029} 2148}
2030 2149
2031sub reset_at { 2150sub reset_at {
2032 my ($self) = @_; 2151 my ($self) = @_;
2033 2152
… …
2065 if $uniq; 2184 if $uniq;
2066 } 2185 }
2067 2186
2068 delete $cf::MAP{$self->path}; 2187 delete $cf::MAP{$self->path};
2069 2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2070 $self->clear; 2191 $self->clear;
2071
2072 $_->clear_links_to ($self) for values %cf::MAP;
2073 2192
2074 $self->unlink_save; 2193 $self->unlink_save;
2075 $self->destroy; 2194 $self->destroy;
2076} 2195}
2077 2196
2078my $nuke_counter = "aaaa"; 2197my $nuke_counter = "aaaa";
2079 2198
2080sub nuke { 2199sub nuke {
2081 my ($self) = @_; 2200 my ($self) = @_;
2082 2201
2202 {
2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204
2083 delete $cf::MAP{$self->path}; 2205 delete $cf::MAP{$self->path};
2084 2206
2085 $self->unlink_save; 2207 $self->unlink_save;
2086 2208
2087 bless $self, "cf::map"; 2209 bless $self, "cf::map";
2088 delete $self->{deny_reset}; 2210 delete $self->{deny_reset};
2089 $self->{deny_save} = 1; 2211 $self->{deny_save} = 1;
2090 $self->reset_timeout (1); 2212 $self->reset_timeout (1);
2091 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2092 2214
2093 $cf::MAP{$self->path} = $self; 2215 $cf::MAP{$self->path} = $self;
2216 }
2094 2217
2095 $self->reset; # polite request, might not happen 2218 $self->reset; # polite request, might not happen
2096} 2219}
2097 2220
2098=item $maps = cf::map::tmp_maps 2221=item $maps = cf::map::tmp_maps
… …
2174 2297
2175sub inv_recursive { 2298sub inv_recursive {
2176 inv_recursive_ inv $_[0] 2299 inv_recursive_ inv $_[0]
2177} 2300}
2178 2301
2302=item $ref = $ob->ref
2303
2304creates and returns a persistent reference to an objetc that can be stored as a string.
2305
2306=item $ob = cf::object::deref ($refstring)
2307
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block.
2310
2311=cut
2312
2313sub deref {
2314 my ($ref) = @_;
2315
2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2317 my ($uuid, $name) = ($1, $2);
2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2319 or return;
2320 $pl->ob->uuid eq $uuid
2321 or return;
2322
2323 $pl->ob
2324 } else {
2325 warn "$ref: cannot resolve object reference\n";
2326 undef
2327 }
2328}
2329
2179package cf; 2330package cf;
2180 2331
2181=back 2332=back
2182 2333
2183=head3 cf::object::player 2334=head3 cf::object::player
… …
2341 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2342 2493
2343 $self->enter_link; 2494 $self->enter_link;
2344 2495
2345 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2499 # *tag paths override both path and x|y
2500 if ($path =~ /^\*(.*)$/) {
2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2502 my $ob = $obs[rand @obs];
2503
2504 # see if we actually can go there
2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2506 $ob = $obs[rand @obs];
2507 } else {
2508 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2509 }
2510 # else put us there anyways for now #d#
2511
2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2515 }
2516 }
2517
2346 my $map = eval { 2518 my $map = eval {
2347 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2348 2520
2349 if ($map) { 2521 if ($map) {
2350 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2351 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2352 } else { 2524 } else {
2353 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2354 } 2526 }
2355 2527
2356 $map 2528 $map
2357 }; 2529 };
2358 2530
… …
2448 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2449 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2450 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2451 2623
2452 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2453 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2454 unless (eval { 2628 unless (eval {
2455 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2456 2630
2457 1; 2631 1;
… …
2492the message, with C<log> being the default. If C<$color> is negative, suppress 2666the message, with C<log> being the default. If C<$color> is negative, suppress
2493the message unless the client supports the msg packet. 2667the message unless the client supports the msg packet.
2494 2668
2495=cut 2669=cut
2496 2670
2671our %CHANNEL = (
2672 "c/identify" => {
2673 id => "infobox",
2674 title => "Identify",
2675 reply => undef,
2676 tooltip => "Items recently identified",
2677 },
2678 "c/examine" => {
2679 id => "infobox",
2680 title => "Examine",
2681 reply => undef,
2682 tooltip => "Signs and other items you examined",
2683 },
2684 "c/book" => {
2685 id => "infobox",
2686 title => "Book",
2687 reply => undef,
2688 tooltip => "The contents of a note or book",
2689 },
2690 "c/lookat" => {
2691 id => "infobox",
2692 title => "Look",
2693 reply => undef,
2694 tooltip => "What you saw there",
2695 },
2696 "c/who" => {
2697 id => "infobox",
2698 title => "Players",
2699 reply => undef,
2700 tooltip => "Shows players who are currently online",
2701 },
2702 "c/body" => {
2703 id => "infobox",
2704 title => "Body Parts",
2705 reply => undef,
2706 tooltip => "Shows which body parts you posess and are available",
2707 },
2708 "c/uptime" => {
2709 id => "infobox",
2710 title => "Uptime",
2711 reply => undef,
2712 tooltip => "How long the server has been running sicne last restart",
2713 },
2714 "c/mapinfo" => {
2715 id => "infobox",
2716 title => "Map Info",
2717 reply => undef,
2718 tooltip => "Information related to the maps",
2719 },
2720);
2721
2497sub cf::client::send_msg { 2722sub cf::client::send_msg {
2498 my ($self, $channel, $msg, $color, @extra) = @_; 2723 my ($self, $channel, $msg, $color, @extra) = @_;
2499 2724
2500 $msg = $self->pl->expand_cfpod ($msg); 2725 $msg = $self->pl->expand_cfpod ($msg);
2501 2726
2502 $color &= cf::NDI_CLIENT_MASK; # just in case... 2727 $color &= cf::NDI_CLIENT_MASK; # just in case...
2503 2728
2729 # check predefined channels, for the benefit of C
2730 if ($CHANNEL{$channel}) {
2731 $channel = $CHANNEL{$channel};
2732
2733 $self->ext_msg (channel_info => $channel)
2734 if $self->can_msg;
2735
2736 $channel = $channel->{id};
2737
2504 if (ref $channel) { 2738 } elsif (ref $channel) {
2505 # send meta info to client, if not yet sent 2739 # send meta info to client, if not yet sent
2506 unless (exists $self->{channel}{$channel->{id}}) { 2740 unless (exists $self->{channel}{$channel->{id}}) {
2507 $self->{channel}{$channel->{id}} = $channel; 2741 $self->{channel}{$channel->{id}} = $channel;
2508 $self->ext_msg (channel_info => $channel); 2742 $self->ext_msg (channel_info => $channel)
2743 if $self->can_msg;
2509 } 2744 }
2510 2745
2511 $channel = $channel->{id}; 2746 $channel = $channel->{id};
2512 } 2747 }
2513 2748
… …
2554=cut 2789=cut
2555 2790
2556sub cf::client::ext_msg($$@) { 2791sub cf::client::ext_msg($$@) {
2557 my ($self, $type, @msg) = @_; 2792 my ($self, $type, @msg) = @_;
2558 2793
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) { 2794 if ($self->extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2795 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove 2796 } elsif ($self->extcmd == 1) { # TODO: remove
2564 push @msg, msgtype => "event_$type"; 2797 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2798 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 } 2799 }
2567} 2800}
2568 2801
… …
2575sub cf::client::ext_reply($$@) { 2808sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_; 2809 my ($self, $id, @msg) = @_;
2577 2810
2578 if ($self->extcmd == 2) { 2811 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2812 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) { 2813 } elsif ($self->extcmd == 1) {
2581 #TODO: version 1, remove 2814 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id; 2815 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2816 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 } 2817 }
2585} 2818}
… …
2727=pod 2960=pod
2728 2961
2729The following functions and methods are available within a safe environment: 2962The following functions and methods are available within a safe environment:
2730 2963
2731 cf::object 2964 cf::object
2732 contr pay_amount pay_player map x y force_find force_add 2965 contr pay_amount pay_player map x y force_find force_add destroy
2733 insert remove name archname title slaying race 2966 insert remove name archname title slaying race decrease_ob_nr
2734 2967
2735 cf::object::player 2968 cf::object::player
2736 player 2969 player
2737 2970
2738 cf::player 2971 cf::player
… …
2743 2976
2744=cut 2977=cut
2745 2978
2746for ( 2979for (
2747 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2980 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2748 insert remove inv name archname title slaying race)], 2981 insert remove inv name archname title slaying race
2982 decrease_ob_nr destroy)],
2749 ["cf::object::player" => qw(player)], 2983 ["cf::object::player" => qw(player)],
2750 ["cf::player" => qw(peaceful)], 2984 ["cf::player" => qw(peaceful)],
2751 ["cf::map" => qw(trigger)], 2985 ["cf::map" => qw(trigger)],
2752) { 2986) {
2753 no strict 'refs'; 2987 no strict 'refs';
… …
2829# the server's init and main functions 3063# the server's init and main functions
2830 3064
2831sub load_facedata($) { 3065sub load_facedata($) {
2832 my ($path) = @_; 3066 my ($path) = @_;
2833 3067
3068 # HACK to clear player env face cache, we need some signal framework
3069 # for this (global event?)
3070 %ext::player_env::MUSIC_FACE_CACHE = ();
3071
2834 my $enc = JSON::XS->new->utf8->canonical; 3072 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2835 3073
2836 warn "loading facedata from $path\n"; 3074 warn "loading facedata from $path\n";
2837 3075
2838 my $facedata; 3076 my $facedata;
2839 0 < aio_load $path, $facedata 3077 0 < aio_load $path, $facedata
… …
2949 $ns->fx_want ($k, $v); 3187 $ns->fx_want ($k, $v);
2950 } 3188 }
2951}; 3189};
2952 3190
2953sub reload_regions { 3191sub reload_regions {
3192 # HACK to clear player env face cache, we need some signal framework
3193 # for this (global event?)
3194 %ext::player_env::MUSIC_FACE_CACHE = ();
3195
2954 load_resource_file "$MAPDIR/regions" 3196 load_resource_file "$MAPDIR/regions"
2955 or die "unable to load regions file\n"; 3197 or die "unable to load regions file\n";
2956 3198
2957 for (cf::region::list) { 3199 for (cf::region::list) {
2958 $_->{match} = qr/$_->{match}/ 3200 $_->{match} = qr/$_->{match}/
… …
2994 3236
2995sub init { 3237sub init {
2996 reload_resources; 3238 reload_resources;
2997} 3239}
2998 3240
2999sub cfg_load { 3241sub reload_config {
3000 open my $fh, "<:utf8", "$CONFDIR/config" 3242 open my $fh, "<:utf8", "$CONFDIR/config"
3001 or return; 3243 or return;
3002 3244
3003 local $/; 3245 local $/;
3004 *CFG = YAML::Syck::Load <$fh>; 3246 *CFG = YAML::Syck::Load <$fh>;
… …
3020sub main { 3262sub main {
3021 # we must not ever block the main coroutine 3263 # we must not ever block the main coroutine
3022 local $Coro::idle = sub { 3264 local $Coro::idle = sub {
3023 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3265 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3024 (async { 3266 (async {
3267 $Coro::current->{desc} = "IDLE BUG HANDLER";
3025 Event::one_event; 3268 Event::one_event;
3026 })->prio (Coro::PRIO_MAX); 3269 })->prio (Coro::PRIO_MAX);
3027 }; 3270 };
3028 3271
3029 cfg_load; 3272 reload_config;
3030 db_init; 3273 db_init;
3031 load_extensions; 3274 load_extensions;
3032 3275
3033 $TICK_WATCHER->start; 3276 $TICK_WATCHER->start;
3034 Event::loop; 3277 Event::loop;
… …
3101 # and maps saved/destroyed asynchronously. 3344 # and maps saved/destroyed asynchronously.
3102 warn "begin emergency player save\n"; 3345 warn "begin emergency player save\n";
3103 for my $login (keys %cf::PLAYER) { 3346 for my $login (keys %cf::PLAYER) {
3104 my $pl = $cf::PLAYER{$login} or next; 3347 my $pl = $cf::PLAYER{$login} or next;
3105 $pl->valid or next; 3348 $pl->valid or next;
3349 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3106 $pl->save; 3350 $pl->save;
3107 } 3351 }
3108 warn "end emergency player save\n"; 3352 warn "end emergency player save\n";
3109 3353
3110 warn "begin emergency map save\n"; 3354 warn "begin emergency map save\n";
… …
3158 3402
3159 warn "flushing outstanding aio requests"; 3403 warn "flushing outstanding aio requests";
3160 for (;;) { 3404 for (;;) {
3161 BDB::flush; 3405 BDB::flush;
3162 IO::AIO::flush; 3406 IO::AIO::flush;
3163 Coro::cede; 3407 Coro::cede_notself;
3164 last unless IO::AIO::nreqs || BDB::nreqs; 3408 last unless IO::AIO::nreqs || BDB::nreqs;
3165 warn "iterate..."; 3409 warn "iterate...";
3166 } 3410 }
3167 3411
3168 ++$RELOAD; 3412 ++$RELOAD;
… …
3227 warn "reloading cf.pm"; 3471 warn "reloading cf.pm";
3228 require cf; 3472 require cf;
3229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3473 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3230 3474
3231 warn "loading config and database again"; 3475 warn "loading config and database again";
3232 cf::cfg_load; 3476 cf::reload_config;
3233 3477
3234 warn "loading extensions"; 3478 warn "loading extensions";
3235 cf::load_extensions; 3479 cf::load_extensions;
3236 3480
3237 warn "reattaching attachments to objects/players"; 3481 warn "reattaching attachments to objects/players";
… …
3273register_command "reload" => sub { 3517register_command "reload" => sub {
3274 my ($who, $arg) = @_; 3518 my ($who, $arg) = @_;
3275 3519
3276 if ($who->flag (FLAG_WIZ)) { 3520 if ($who->flag (FLAG_WIZ)) {
3277 $who->message ("reloading server."); 3521 $who->message ("reloading server.");
3522 async {
3523 $Coro::current->{desc} = "perl_reload";
3278 async { reload_perl }; 3524 reload_perl;
3525 };
3279 } 3526 }
3280}; 3527};
3281 3528
3282unshift @INC, $LIBDIR; 3529unshift @INC, $LIBDIR;
3283 3530
… …
3302 my $signal = new Coro::Signal; 3549 my $signal = new Coro::Signal;
3303 push @WAIT_FOR_TICK_BEGIN, $signal; 3550 push @WAIT_FOR_TICK_BEGIN, $signal;
3304 $signal->wait; 3551 $signal->wait;
3305} 3552}
3306 3553
3307 my $min = 1e6;#d#
3308 my $avg = 10;
3309$TICK_WATCHER = Event->timer ( 3554$TICK_WATCHER = Event->timer (
3310 reentrant => 0, 3555 reentrant => 0,
3311 parked => 1, 3556 parked => 1,
3312 prio => 0, 3557 prio => 0,
3313 at => $NEXT_TICK || $TICK, 3558 at => $NEXT_TICK || $TICK,
… …
3321 3566
3322 $NOW = $tick_start = Event::time; 3567 $NOW = $tick_start = Event::time;
3323 3568
3324 cf::server_tick; # one server iteration 3569 cf::server_tick; # one server iteration
3325 3570
3326 0 && sync_job {#d#
3327 for(1..10) {
3328 my $t = Event::time;
3329 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3330 or die;
3331
3332 $map->width (50);
3333 $map->height (50);
3334 $map->alloc;
3335 $map->_load_objects ("/tmp/x.map", 1);
3336 my $t = Event::time - $t;
3337
3338 #next unless $t < 0.0013;#d#
3339 if ($t < $min) {
3340 $min = $t;
3341 }
3342 $avg = $avg * 0.99 + $t * 0.01;
3343 }
3344 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3345 exit 0;
3346 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3347 };
3348
3349 $RUNTIME += $TICK; 3571 $RUNTIME += $TICK;
3350 $NEXT_TICK += $TICK; 3572 $NEXT_TICK += $TICK;
3351 3573
3352 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3574 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3353 $NEXT_RUNTIME_WRITE = $NOW + 10; 3575 $NEXT_RUNTIME_WRITE = $NOW + 10;
3354 Coro::async_pool { 3576 Coro::async_pool {
3577 $Coro::current->{desc} = "runtime saver";
3355 write_runtime 3578 write_runtime
3356 or warn "ERROR: unable to write runtime file: $!"; 3579 or warn "ERROR: unable to write runtime file: $!";
3357 }; 3580 };
3358 } 3581 }
3359 3582
3360# my $AFTER = Event::time;
3361# warn $AFTER - $NOW;#d#
3362
3363 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3583 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3364 $sig->send; 3584 $sig->send;
3365 } 3585 }
3366 while (my $sig = shift @WAIT_FOR_TICK) { 3586 while (my $sig = shift @WAIT_FOR_TICK) {
3367 $sig->send; 3587 $sig->send;
… …
3377 3597
3378 $LOAD = ($NOW - $tick_start) / $TICK; 3598 $LOAD = ($NOW - $tick_start) / $TICK;
3379 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3599 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3380 3600
3381 _post_tick; 3601 _post_tick;
3382
3383
3384 }, 3602 },
3385); 3603);
3386 3604
3387{ 3605{
3606 BDB::min_parallel 8;
3388 BDB::max_poll_time $TICK * 0.1; 3607 BDB::max_poll_time $TICK * 0.1;
3389 $BDB_POLL_WATCHER = Event->io ( 3608 $BDB_POLL_WATCHER = Event->io (
3390 reentrant => 0, 3609 reentrant => 0,
3391 fd => BDB::poll_fileno, 3610 fd => BDB::poll_fileno,
3392 poll => 'r', 3611 poll => 'r',
3393 prio => 0, 3612 prio => 0,
3394 data => WF_AUTOCANCEL, 3613 data => WF_AUTOCANCEL,
3395 cb => \&BDB::poll_cb, 3614 cb => \&BDB::poll_cb,
3396 ); 3615 );
3397 BDB::min_parallel 8;
3398 3616
3399 BDB::set_sync_prepare { 3617 BDB::set_sync_prepare {
3400 my $status; 3618 my $status;
3401 my $current = $Coro::current; 3619 my $current = $Coro::current;
3402 ( 3620 (
… …
3411 ) 3629 )
3412 }; 3630 };
3413 3631
3414 unless ($DB_ENV) { 3632 unless ($DB_ENV) {
3415 $DB_ENV = BDB::db_env_create; 3633 $DB_ENV = BDB::db_env_create;
3634 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3635 | BDB::LOG_AUTOREMOVE, 1);
3636 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3637 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3416 3638
3417 cf::sync_job { 3639 cf::sync_job {
3418 eval { 3640 eval {
3419 BDB::db_env_open 3641 BDB::db_env_open
3420 $DB_ENV, 3642 $DB_ENV,
… …
3422 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3644 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3423 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3645 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3424 0666; 3646 0666;
3425 3647
3426 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3648 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3427
3428 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3429 $DB_ENV->set_lk_detect;
3430 }; 3649 };
3431 3650
3432 cf::cleanup "db_env_open(db): $@" if $@; 3651 cf::cleanup "db_env_open(db): $@" if $@;
3433 }; 3652 };
3434 } 3653 }
3654
3655 $BDB_DEADLOCK_WATCHER = Event->timer (
3656 after => 3,
3657 interval => 1,
3658 hard => 1,
3659 prio => 0,
3660 data => WF_AUTOCANCEL,
3661 cb => sub {
3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 },
3664 );
3665 $BDB_CHECKPOINT_WATCHER = Event->timer (
3666 after => 11,
3667 interval => 60,
3668 hard => 1,
3669 prio => 0,
3670 data => WF_AUTOCANCEL,
3671 cb => sub {
3672 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3673 },
3674 );
3675 $BDB_TRICKLE_WATCHER = Event->timer (
3676 after => 5,
3677 interval => 10,
3678 hard => 1,
3679 prio => 0,
3680 data => WF_AUTOCANCEL,
3681 cb => sub {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 },
3684 );
3435} 3685}
3436 3686
3437{ 3687{
3438 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3439 3689
… …
3442 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = Event->io (
3443 reentrant => 0, 3693 reentrant => 0,
3444 data => WF_AUTOCANCEL, 3694 data => WF_AUTOCANCEL,
3445 fd => IO::AIO::poll_fileno, 3695 fd => IO::AIO::poll_fileno,
3446 poll => 'r', 3696 poll => 'r',
3447 prio => 6, 3697 prio => 0,
3448 cb => \&IO::AIO::poll_cb, 3698 cb => \&IO::AIO::poll_cb,
3449 ); 3699 );
3450} 3700}
3451 3701
3452my $_log_backtrace; 3702my $_log_backtrace;
… …
3458 3708
3459 # limit the # of concurrent backtraces 3709 # limit the # of concurrent backtraces
3460 if ($_log_backtrace < 2) { 3710 if ($_log_backtrace < 2) {
3461 ++$_log_backtrace; 3711 ++$_log_backtrace;
3462 async { 3712 async {
3713 $Coro::current->{desc} = "abt $msg";
3714
3463 my @bt = fork_call { 3715 my @bt = fork_call {
3464 @addr = map { sprintf "%x", $_ } @addr; 3716 @addr = map { sprintf "%x", $_ } @addr;
3465 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3717 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3466 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3718 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3467 or die "addr2line: $!"; 3719 or die "addr2line: $!";

Diff Legend

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