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.342 by root, Sun Aug 26 15:31:02 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 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::blocking_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;
1061 $av = eval { (Storable::thaw $av)->{objs} };
1062 }
1063 1126
1127 my $st = eval { Coro::Storable::thaw $av }
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1130 }
1131
1132 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
1135
1066 return ($data, $av); 1136 ($data, $av)
1067} 1137}
1068 1138
1069=head2 COMMAND CALLBACKS 1139=head2 COMMAND CALLBACKS
1070 1140
1071=over 4 1141=over 4
… …
1257 1327
1258=head3 cf::player 1328=head3 cf::player
1259 1329
1260=over 4 1330=over 4
1261 1331
1332=item cf::player::num_playing
1333
1334Returns the official number of playing players, as per the Crossfire metaserver rules.
1335
1336=cut
1337
1338sub num_playing {
1339 scalar grep
1340 $_->ob->map
1341 && !$_->hidden
1342 && !$_->ob->flag (cf::FLAG_WIZ),
1343 cf::player::list
1344}
1345
1262=item cf::player::find $login 1346=item cf::player::find $login
1263 1347
1264Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1265 1349
1266=cut 1350=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1385 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1386 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1387 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1389
1306 my $pl = load_pl path $login 1390 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1391 or return;
1392
1393 my $pl = cf::player::load_pl $f
1394 or return;
1395 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
1309 } 1398 }
1310 } 1399 }
1311} 1400}
1312 1401
… …
1322 1411
1323 aio_mkdir playerdir $pl, 0770; 1412 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1413 $pl->{last_save} = $cf::RUNTIME;
1325 1414
1326 $pl->save_pl ($path); 1415 $pl->save_pl ($path);
1327 Coro::cede; 1416 cf::cede_to_tick;
1328} 1417}
1329 1418
1330sub new($) { 1419sub new($) {
1331 my ($login) = @_; 1420 my ($login) = @_;
1332 1421
… …
1410 or return []; 1499 or return [];
1411 1500
1412 my @logins; 1501 my @logins;
1413 1502
1414 for my $login (@$dirs) { 1503 for my $login (@$dirs) {
1504 my $path = path $login;
1505
1506 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1509 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1510 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 }
1418 1512
1419 utf8::decode $login; 1513 utf8::decode $login;
1420 push @logins, $login; 1514 push @logins, $login;
1421 } 1515 }
1422 1516
… …
1460sub expand_cfpod { 1554sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1555 ((my $self), (local $_)) = @_;
1462 1556
1463 # escape & and < 1557 # escape & and <
1464 s/&/&amp;/g; 1558 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1559 s/(?<![BIUGHT])</&lt;/g;
1466 1560
1467 # this is buggy, it needs to properly take care of nested <'s 1561 # this is buggy, it needs to properly take care of nested <'s
1468 1562
1469 1 while 1563 1 while
1470 # replace B<>, I<>, U<> etc. 1564 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1565 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1569 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1570 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1571 $self->gender ? $2 : $1
1477 }ge 1572 }ge
1478 # replace H<hint text> 1573 # replace H<hint text>
… …
1746 1841
1747sub load_header_from($) { 1842sub load_header_from($) {
1748 my ($self, $path) = @_; 1843 my ($self, $path) = @_;
1749 1844
1750 utf8::encode $path; 1845 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1846 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1847 or return;
1848
1849 $self->_load_header ($f)
1850 or return;
1851
1852 local $MAP_LOADING{$self->{path}} = $self;
1853 $f->resolve_delayed_derefs;
1756 1854
1757 $self->{load_path} = $path; 1855 $self->{load_path} = $path;
1758 1856
1759 1 1857 1
1760} 1858}
… …
1814sub find { 1912sub find {
1815 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1816 1914
1817 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1818 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1820 1919
1821 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1823 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1824 or return; 1925 or return;
1825 1926
1826 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1827 1928
… …
1829 or return; 1930 or return;
1830 1931
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1834 $map->reset; 1937 $map->reset;
1835 undef $guard;
1836 return find $path; 1938 return find $path;
1837 } 1939 }
1838 1940
1839 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1840 } 1942 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1850 1952
1851 my $path = $self->{path}; 1953 my $path = $self->{path};
1852 1954
1853 { 1955 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1855 1957
1958 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 1960
1858 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1859 1962
1860 $self->alloc; 1963 $self->alloc;
1861 1964
1862 $self->pre_load; 1965 $self->pre_load;
1863 Coro::cede; 1966 cf::cede_to_tick;
1864 1967
1968 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 1970 $self->_load_objects ($f)
1866 or return; 1971 or return;
1867 1972
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 1974 if delete $self->{load_original};
1870 1975
1871 if (my $uniq = $self->uniq_path) { 1976 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 1977 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 1978 unless (aio_stat $uniq) {
1979 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 1980 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1981 $self->_load_objects ($f);
1982 $f->resolve_delayed_derefs;
1983 }
1876 } 1984 }
1877 } 1985 }
1878 1986
1879 Coro::cede; 1987 $f->resolve_delayed_derefs;
1988
1989 cf::cede_to_tick;
1880 # now do the right thing for maps 1990 # now do the right thing for maps
1881 $self->link_multipart_objects; 1991 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1992 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1993 unless $self->difficulty;
1884 Coro::cede; 1994 cf::cede_to_tick;
1885 1995
1886 unless ($self->{deny_activate}) { 1996 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1997 $self->decay_objects;
1888 $self->fix_auto_apply; 1998 $self->fix_auto_apply;
1889 $self->update_buttons; 1999 $self->update_buttons;
1890 Coro::cede; 2000 cf::cede_to_tick;
1891 $self->set_darkness_map; 2001 $self->set_darkness_map;
1892 Coro::cede; 2002 cf::cede_to_tick;
1893 $self->activate; 2003 $self->activate;
1894 } 2004 }
1895 2005
1896 $self->{last_save} = $cf::RUNTIME; 2006 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2007 $self->last_access ($cf::RUNTIME);
… …
1968 } 2078 }
1969 2079
1970 $MAP_PREFETCH{$path} |= $load; 2080 $MAP_PREFETCH{$path} |= $load;
1971 2081
1972 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
1973 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2087 if (my $map = find $k) {
1976 $map->load if $v; 2088 $map->load if $v;
1977 } 2089 }
… …
1987} 2099}
1988 2100
1989sub save { 2101sub save {
1990 my ($self) = @_; 2102 my ($self) = @_;
1991 2103
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2105
1994 $self->{last_save} = $cf::RUNTIME; 2106 $self->{last_save} = $cf::RUNTIME;
1995 2107
1996 return unless $self->dirty; 2108 return unless $self->dirty;
1997 2109
… …
2003 return if $self->{deny_save}; 2115 return if $self->{deny_save};
2004 2116
2005 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
2006 2118
2007 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
2009 }; 2122 };
2010 2123
2011 if ($uniq) { 2124 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2020 my ($self) = @_; 2133 my ($self) = @_;
2021 2134
2022 # save first because save cedes 2135 # save first because save cedes
2023 $self->save; 2136 $self->save;
2024 2137
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2139
2027 return if $self->players; 2140 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2142 return if $self->{deny_save};
2030 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2148 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2149}
2034 2150
2035sub reset_at { 2151sub reset_at {
2036 my ($self) = @_; 2152 my ($self) = @_;
2037 2153
… …
2069 if $uniq; 2185 if $uniq;
2070 } 2186 }
2071 2187
2072 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
2073 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2192 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2193
2078 $self->unlink_save; 2194 $self->unlink_save;
2079 $self->destroy; 2195 $self->destroy;
2080} 2196}
2081 2197
2082my $nuke_counter = "aaaa"; 2198my $nuke_counter = "aaaa";
2083 2199
2084sub nuke { 2200sub nuke {
2085 my ($self) = @_; 2201 my ($self) = @_;
2086 2202
2203 {
2204 my $lock = cf::lock_acquire "map_data:$self->{path}";
2205
2087 delete $cf::MAP{$self->path}; 2206 delete $cf::MAP{$self->path};
2088 2207
2089 $self->unlink_save; 2208 $self->unlink_save;
2090 2209
2091 bless $self, "cf::map"; 2210 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2211 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2212 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2213 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2214 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2215
2097 $cf::MAP{$self->path} = $self; 2216 $cf::MAP{$self->path} = $self;
2217 }
2098 2218
2099 $self->reset; # polite request, might not happen 2219 $self->reset; # polite request, might not happen
2100} 2220}
2101 2221
2102=item $maps = cf::map::tmp_maps 2222=item $maps = cf::map::tmp_maps
… …
2178 2298
2179sub inv_recursive { 2299sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2300 inv_recursive_ inv $_[0]
2181} 2301}
2182 2302
2303=item $ref = $ob->ref
2304
2305creates and returns a persistent reference to an objetc that can be stored as a string.
2306
2307=item $ob = cf::object::deref ($refstring)
2308
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block.
2311
2312=cut
2313
2314sub deref {
2315 my ($ref) = @_;
2316
2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2318 my ($uuid, $name) = ($1, $2);
2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2320 or return;
2321 $pl->ob->uuid eq $uuid
2322 or return;
2323
2324 $pl->ob
2325 } else {
2326 warn "$ref: cannot resolve object reference\n";
2327 undef
2328 }
2329}
2330
2183package cf; 2331package cf;
2184 2332
2185=back 2333=back
2186 2334
2187=head3 cf::object::player 2335=head3 cf::object::player
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2494
2347 $self->enter_link; 2495 $self->enter_link;
2348 2496
2349 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
2350 my $map = eval { 2519 my $map = eval {
2351 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2352 2521
2353 if ($map) { 2522 if ($map) {
2354 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2356 } else { 2525 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2527 }
2359 2528
2360 $map 2529 $map
2361 }; 2530 };
2362 2531
… …
2452 # if exit is damned, update players death & WoR home-position 2621 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp) 2622 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED); 2623 if $exit->flag (FLAG_DAMNED);
2455 2624
2456 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2457 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2458 unless (eval { 2629 unless (eval {
2459 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2460 2631
2461 1; 2632 1;
… …
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2667the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2668the message unless the client supports the msg packet.
2498 2669
2499=cut 2670=cut
2500 2671
2672our %CHANNEL = (
2673 "c/identify" => {
2674 id => "infobox",
2675 title => "Identify",
2676 reply => undef,
2677 tooltip => "Items recently identified",
2678 },
2679 "c/examine" => {
2680 id => "infobox",
2681 title => "Examine",
2682 reply => undef,
2683 tooltip => "Signs and other items you examined",
2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2691);
2692
2501sub cf::client::send_msg { 2693sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2694 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2695
2504 $msg = $self->pl->expand_cfpod ($msg); 2696 $msg = $self->pl->expand_cfpod ($msg);
2505 2697
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2699
2700 # check predefined channels, for the benefit of C
2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2508 if (ref $channel) { 2709 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2710 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2711 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2712 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2713 $self->ext_msg (channel_info => $channel)
2714 if $self->can_msg;
2513 } 2715 }
2514 2716
2515 $channel = $channel->{id}; 2717 $channel = $channel->{id};
2516 } 2718 }
2517 2719
… …
2558=cut 2760=cut
2559 2761
2560sub cf::client::ext_msg($$@) { 2762sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2763 my ($self, $type, @msg) = @_;
2562 2764
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2765 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2766 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2767 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2768 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2769 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2770 }
2571} 2771}
2572 2772
… …
2579sub cf::client::ext_reply($$@) { 2779sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2780 my ($self, $id, @msg) = @_;
2581 2781
2582 if ($self->extcmd == 2) { 2782 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2783 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2784 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2785 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2786 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2787 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2788 }
2589} 2789}
… …
2731=pod 2931=pod
2732 2932
2733The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2734 2934
2735 cf::object 2935 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 2936 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race decrease_ob_nr 2937 insert remove name archname title slaying race decrease_ob_nr
2738 2938
2739 cf::object::player 2939 cf::object::player
2740 player 2940 player
2741 2941
… …
2748=cut 2948=cut
2749 2949
2750for ( 2950for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race 2952 insert remove inv name archname title slaying race
2753 decrease_ob_nr)], 2953 decrease_ob_nr destroy)],
2754 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2755 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2756 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2757) { 2957) {
2758 no strict 'refs'; 2958 no strict 'refs';
… …
2834# the server's init and main functions 3034# the server's init and main functions
2835 3035
2836sub load_facedata($) { 3036sub load_facedata($) {
2837 my ($path) = @_; 3037 my ($path) = @_;
2838 3038
3039 # HACK to clear player env face cache, we need some signal framework
3040 # for this (global event?)
3041 %ext::player_env::MUSIC_FACE_CACHE = ();
3042
2839 my $enc = JSON::XS->new->utf8->canonical; 3043 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 3044
2841 warn "loading facedata from $path\n"; 3045 warn "loading facedata from $path\n";
2842 3046
2843 my $facedata; 3047 my $facedata;
2844 0 < aio_load $path, $facedata 3048 0 < aio_load $path, $facedata
… …
2954 $ns->fx_want ($k, $v); 3158 $ns->fx_want ($k, $v);
2955 } 3159 }
2956}; 3160};
2957 3161
2958sub reload_regions { 3162sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
2959 load_resource_file "$MAPDIR/regions" 3167 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3168 or die "unable to load regions file\n";
2961 3169
2962 for (cf::region::list) { 3170 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3171 $_->{match} = qr/$_->{match}/
… …
2999 3207
3000sub init { 3208sub init {
3001 reload_resources; 3209 reload_resources;
3002} 3210}
3003 3211
3004sub cfg_load { 3212sub reload_config {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3213 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3214 or return;
3007 3215
3008 local $/; 3216 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3217 *CFG = YAML::Syck::Load <$fh>;
… …
3025sub main { 3233sub main {
3026 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
3027 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
3028 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3029 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
3030 Event::one_event; 3239 Event::one_event;
3031 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
3032 }; 3241 };
3033 3242
3034 cfg_load; 3243 reload_config;
3035 db_init; 3244 db_init;
3036 load_extensions; 3245 load_extensions;
3037 3246
3038 $TICK_WATCHER->start; 3247 $TICK_WATCHER->start;
3039 Event::loop; 3248 Event::loop;
… …
3106 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
3107 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
3108 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
3109 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
3110 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3111 $pl->save; 3321 $pl->save;
3112 } 3322 }
3113 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
3114 3324
3115 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
… …
3163 3373
3164 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
3165 for (;;) { 3375 for (;;) {
3166 BDB::flush; 3376 BDB::flush;
3167 IO::AIO::flush; 3377 IO::AIO::flush;
3168 Coro::cede; 3378 Coro::cede_notself;
3169 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
3170 warn "iterate..."; 3380 warn "iterate...";
3171 } 3381 }
3172 3382
3173 ++$RELOAD; 3383 ++$RELOAD;
… …
3232 warn "reloading cf.pm"; 3442 warn "reloading cf.pm";
3233 require cf; 3443 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3445
3236 warn "loading config and database again"; 3446 warn "loading config and database again";
3237 cf::cfg_load; 3447 cf::reload_config;
3238 3448
3239 warn "loading extensions"; 3449 warn "loading extensions";
3240 cf::load_extensions; 3450 cf::load_extensions;
3241 3451
3242 warn "reattaching attachments to objects/players"; 3452 warn "reattaching attachments to objects/players";
… …
3278register_command "reload" => sub { 3488register_command "reload" => sub {
3279 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
3280 3490
3281 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
3282 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
3283 async { reload_perl }; 3495 reload_perl;
3496 };
3284 } 3497 }
3285}; 3498};
3286 3499
3287unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
3288 3501
… …
3307 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 3522 $signal->wait;
3310} 3523}
3311 3524
3312 my $min = 1e6;#d#
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
3315 reentrant => 0, 3526 reentrant => 0,
3316 parked => 1, 3527 parked => 1,
3317 prio => 0, 3528 prio => 0,
3318 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
… …
3326 3537
3327 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
3328 3539
3329 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
3330 3541
3331 0 && sync_job {#d#
3332 for(1..10) {
3333 my $t = Event::time;
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3335 or die;
3336
3337 $map->width (50);
3338 $map->height (50);
3339 $map->alloc;
3340 $map->_load_objects ("/tmp/x.map", 1);
3341 my $t = Event::time - $t;
3342
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 };
3353
3354 $RUNTIME += $TICK; 3542 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
3356 3544
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
3359 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
3360 write_runtime 3549 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
3362 }; 3551 };
3363 } 3552 }
3364 3553
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 3555 $sig->send;
3370 } 3556 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 3558 $sig->send;
… …
3382 3568
3383 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 3571
3386 _post_tick; 3572 _post_tick;
3387
3388
3389 }, 3573 },
3390); 3574);
3391 3575
3392{ 3576{
3577 BDB::min_parallel 8;
3393 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
3394 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
3395 reentrant => 0, 3580 reentrant => 0,
3396 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
3397 poll => 'r', 3582 poll => 'r',
3398 prio => 0, 3583 prio => 0,
3399 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
3401 ); 3586 );
3402 BDB::min_parallel 8;
3403 3587
3404 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
3405 my $status; 3589 my $status;
3406 my $current = $Coro::current; 3590 my $current = $Coro::current;
3407 ( 3591 (
… …
3416 ) 3600 )
3417 }; 3601 };
3418 3602
3419 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
3420 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3421 3609
3422 cf::sync_job { 3610 cf::sync_job {
3423 eval { 3611 eval {
3424 BDB::db_env_open 3612 BDB::db_env_open
3425 $DB_ENV, 3613 $DB_ENV,
… …
3427 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 3617 0666;
3430 3618
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 3620 };
3436 3621
3437 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 3623 };
3439 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
3440} 3656}
3441 3657
3442{ 3658{
3443 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3444 3660
… …
3447 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3448 reentrant => 0, 3664 reentrant => 0,
3449 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3450 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3451 poll => 'r', 3667 poll => 'r',
3452 prio => 6, 3668 prio => 0,
3453 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3454 ); 3670 );
3455} 3671}
3456 3672
3457my $_log_backtrace; 3673my $_log_backtrace;
… …
3463 3679
3464 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3465 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3466 ++$_log_backtrace; 3682 ++$_log_backtrace;
3467 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3468 my @bt = fork_call { 3686 my @bt = fork_call {
3469 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3470 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3471 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3472 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

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