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.362 by root, Mon Sep 10 12:44:06 2007 UTC vs.
Revision 1.393 by root, Fri Oct 26 04:47:00 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;
… …
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;
… …
351our @SLOT_QUEUE; 354our @SLOT_QUEUE;
352our $SLOT_QUEUE; 355our $SLOT_QUEUE;
353 356
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
356 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
357 362
358 while () { 363 while () {
359 next_job: 364 next_job:
360 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
368 } 373 }
369 } 374 }
370 } 375 }
371 376
372 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
373 # 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
374 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 380 $signal->wait;
376 } else { 381 } else {
377 Coro::schedule; 382 Coro::schedule;
378 } 383 }
… …
422 my $time = Event::time; 427 my $time = Event::time;
423 428
424 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
426 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
427 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
428 # (but this is cancel-safe) 435 # (but this is cancel-safe)
429 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
430 437
431 my $busy = 1; 438 my $busy = 1;
432 my @res; 439 my @res;
433 440
434 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 443 @res = eval { $job->() };
436 warn $@ if $@; 444 warn $@ if $@;
437 undef $busy; 445 undef $busy;
438 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
439 447
440 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
441 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
442 } 454 }
443 455
444 $time = Event::time - $time; 456 $time = Event::time - $time;
445 457
446 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
507=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
508 520
509Stores 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
510data 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).
511 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
512=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}
513 547
514our $DB; 548our $DB;
515 549
516sub db_init { 550sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job { 551 cf::sync_job {
521 eval { 552 $DB ||= db_table "db";
522 $DB->set_flags (BDB::CHKSUM);
523
524 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
525 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
526 cf::cleanup "db_open(db): $!" if $!;
527 };
528 cf::cleanup "db_open(db): $@" if $@;
529 };
530 } 553 };
531} 554}
532 555
533sub db_get($$) { 556sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
535 558
… …
947 970
948=cut 971=cut
949 972
950############################################################################# 973#############################################################################
951# object support 974# object support
952#
953 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#
954sub _can_merge { 1009sub _can_merge {
955 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
956 1011
957 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1013
961 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
962} 1016}
963 1017
964sub reattach { 1018sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1012); 1066);
1013 1067
1014sub object_freezer_save { 1068sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1016 1070
1017 my $guard = cf::lock_acquire "io";
1018
1019 sync_job { 1071 sync_job {
1020 if (length $$rdata) { 1072 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1073 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1023 $decname, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
… …
1029 close $fh; 1081 close $fh;
1030 1082
1031 if (@$objs) { 1083 if (@$objs) {
1032 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) {
1033 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1089 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1091 }
… …
1048 } else { 1100 } else {
1049 aio_unlink $filename; 1101 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1051 } 1103 }
1052 }; 1104 };
1053
1054 undef $guard;
1055} 1105}
1056 1106
1057sub object_freezer_as_string { 1107sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1059 1109
… …
1064 1114
1065sub object_thawer_load { 1115sub object_thawer_load {
1066 my ($filename) = @_; 1116 my ($filename) = @_;
1067 1117
1068 my ($data, $av); 1118 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1119
1072 (aio_load $filename, $data) >= 0 1120 (aio_load $filename, $data) >= 0
1073 or return; 1121 or return;
1074 1122
1075 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1125 or return;
1078 1126
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1081 } 1129 }
1082 1130
1083 utf8::decode (my $decname = $filename); 1131 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
… …
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1388
1341 my $f = new_from_file cf::object::thawer path $login 1389 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1390 or return;
1343 1391
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1392 my $pl = cf::player::load_pl $f
1346 or return; 1393 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1394 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1395 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
… …
1501 1548
1502Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1503 1550
1504=cut 1551=cut
1505 1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1506sub expand_cfpod { 1564sub expand_cfpod {
1507 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1508 1566
1509 # escape & and < 1567 my $xml;
1510 s/&/&amp;/g;
1511 s/(?<![BIUGHT])</&lt;/g;
1512 1568
1513 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1514 1572
1515 1 while 1573 $group =~ s/&/&amp;/g;
1516 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1517 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1518 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1519 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1578 ([BCGHITU])
1521 # replace G<male|female> tags 1579 <
1522 || s{G<([^>|]*)\|([^>]*)>}{ 1580 (?:
1523 $self->gender ? $2 : $1 1581 ([^<>]*) (?{ $group = $^N })
1524 }ge 1582 | < $interior >
1525 # replace H<hint text> 1583 )
1526 || s{H<([^\>]*)>} 1584 >
1585 %gcsx
1527 { 1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1528 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1529 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1530 "") 1606 "")
1531 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1532 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1533 1618
1619 for ($xml) {
1534 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1535 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1536 1622
1537 # compress some whitespace 1623 # compress some whitespace
1538 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1539 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1540 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1541 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1542 1629
1543 $_ 1630 $xml
1544} 1631}
1632
1633no re 'eval';
1545 1634
1546sub hintmode { 1635sub hintmode {
1547 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1548 $_[0]{hintmode} 1637 $_[0]{hintmode}
1549} 1638}
… …
2030 } 2119 }
2031 2120
2032 $MAP_PREFETCH{$path} |= $load; 2121 $MAP_PREFETCH{$path} |= $load;
2033 2122
2034 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
2035 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2128 if (my $map = find $k) {
2038 $map->load if $v; 2129 $map->load if $v;
2039 } 2130 }
… …
2065 return if $self->{deny_save}; 2156 return if $self->{deny_save};
2066 2157
2067 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
2068 2159
2069 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
2071 }; 2163 };
2072 2164
2073 if ($uniq) { 2165 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2261=cut 2353=cut
2262 2354
2263sub deref { 2355sub deref {
2264 my ($ref) = @_; 2356 my ($ref) = @_;
2265 2357
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2359 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2361 or return;
2273 $pl->ob->uuid eq $uuid 2362 $pl->ob->uuid eq $uuid
2274 or return; 2363 or return;
… …
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2535
2447 $self->enter_link; 2536 $self->enter_link;
2448 2537
2449 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
2450 my $map = eval { 2560 my $map = eval {
2451 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2452 2562
2453 if ($map) { 2563 if ($map) {
2454 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2456 } else { 2566 } else {
2457 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2458 } 2568 }
2459 2569
2460 $map 2570 $map
2461 }; 2571 };
2462 2572
… …
2552 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2555 2665
2556 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2557 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2558 unless (eval { 2670 unless (eval {
2559 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2560 2672
2561 1; 2673 1;
… …
2596the message, with C<log> being the default. If C<$color> is negative, suppress 2708the message, with C<log> being the default. If C<$color> is negative, suppress
2597the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2598 2710
2599=cut 2711=cut
2600 2712
2713# non-persistent channels (usually the info channel)
2601our %CHANNEL = ( 2714our %CHANNEL = (
2602 "c/identify" => { 2715 "c/identify" => {
2603 id => "identify", 2716 id => "infobox",
2604 title => "Identify", 2717 title => "Identify",
2605 reply => undef, 2718 reply => undef,
2606 tooltip => "Items recently identified", 2719 tooltip => "Items recently identified",
2607 }, 2720 },
2608 "c/examine" => { 2721 "c/examine" => {
2609 id => "examine", 2722 id => "infobox",
2610 title => "Examine", 2723 title => "Examine",
2611 reply => undef, 2724 reply => undef,
2612 tooltip => "Signs and other items you examined", 2725 tooltip => "Signs and other items you examined",
2613 }, 2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2614); 2763);
2615 2764
2616sub cf::client::send_msg { 2765sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2618 2767
2619 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2620 2769
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 2771
2623 # check predefined channels, for the benefit of C 2772 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2625 2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2626 if (ref $channel) { 2781 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 2782 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 2783 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 2784 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 2785 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg; 2786 if $self->can_msg;
… …
2848=pod 3003=pod
2849 3004
2850The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2851 3006
2852 cf::object 3007 cf::object
2853 contr pay_amount pay_player map x y force_find force_add 3008 contr pay_amount pay_player map x y force_find force_add destroy
2854 insert remove name archname title slaying race decrease_ob_nr 3009 insert remove name archname title slaying race decrease_ob_nr
2855 3010
2856 cf::object::player 3011 cf::object::player
2857 player 3012 player
2858 3013
… …
2865=cut 3020=cut
2866 3021
2867for ( 3022for (
2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race 3024 insert remove inv name archname title slaying race
2870 decrease_ob_nr)], 3025 decrease_ob_nr destroy)],
2871 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2873 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2874) { 3029) {
2875 no strict 'refs'; 3030 no strict 'refs';
… …
3150sub main { 3305sub main {
3151 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
3153 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3154 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
3155 Event::one_event; 3311 Event::one_event;
3156 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
3157 }; 3313 };
3158 3314
3159 reload_config; 3315 reload_config;
… …
3231 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
3233 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3393 $pl->save;
3237 } 3394 }
3238 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
3239 3396
3240 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
… …
3288 3445
3289 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3290 for (;;) { 3447 for (;;) {
3291 BDB::flush; 3448 BDB::flush;
3292 IO::AIO::flush; 3449 IO::AIO::flush;
3293 Coro::cede; 3450 Coro::cede_notself;
3294 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3295 warn "iterate..."; 3452 warn "iterate...";
3296 } 3453 }
3297 3454
3298 ++$RELOAD; 3455 ++$RELOAD;
… …
3403register_command "reload" => sub { 3560register_command "reload" => sub {
3404 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3405 3562
3406 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 3567 reload_perl;
3568 };
3409 } 3569 }
3410}; 3570};
3411 3571
3412unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3413 3573
… …
3432 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 3594 $signal->wait;
3435} 3595}
3436 3596
3437 my $min = 1e6;#d#
3438 my $avg = 10;
3439$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
3440 reentrant => 0, 3598 reentrant => 0,
3441 parked => 1, 3599 parked => 1,
3442 prio => 0, 3600 prio => 0,
3443 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
… …
3451 3609
3452 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
3453 3611
3454 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3455 3613
3456 0 && sync_job {#d#
3457 for(1..10) {
3458 my $t = Event::time;
3459 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3460 or die;
3461
3462 $map->width (50);
3463 $map->height (50);
3464 $map->alloc;
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3466 my $t = Event::time - $t;
3467
3468 #next unless $t < 0.0013;#d#
3469 if ($t < $min) {
3470 $min = $t;
3471 }
3472 $avg = $avg * 0.99 + $t * 0.01;
3473 }
3474 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3475 exit 0;
3476 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3477 };
3478
3479 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3481 3616
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3621 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3487 }; 3623 };
3488 } 3624 }
3489 3625
3490# my $AFTER = Event::time;
3491# warn $AFTER - $NOW;#d#
3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 3627 $sig->send;
3495 } 3628 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 3630 $sig->send;
… …
3507 3640
3508 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 3643
3511 _post_tick; 3644 _post_tick;
3512
3513
3514 }, 3645 },
3515); 3646);
3516 3647
3517{ 3648{
3649 BDB::min_parallel 8;
3518 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
3519 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
3520 reentrant => 0, 3652 reentrant => 0,
3521 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
3522 poll => 'r', 3654 poll => 'r',
3523 prio => 0, 3655 prio => 0,
3524 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
3525 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
3526 ); 3658 );
3527 BDB::min_parallel 8;
3528 3659
3529 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
3530 my $status; 3661 my $status;
3531 my $current = $Coro::current; 3662 my $current = $Coro::current;
3532 ( 3663 (
… …
3541 ) 3672 )
3542 }; 3673 };
3543 3674
3544 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3545 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3546 3681
3547 cf::sync_job { 3682 cf::sync_job {
3548 eval { 3683 eval {
3549 BDB::db_env_open 3684 BDB::db_env_open
3550 $DB_ENV, 3685 $DB_ENV,
… …
3552 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 3689 0666;
3555 3690
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3557
3558 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3559 $DB_ENV->set_lk_detect;
3560 }; 3692 };
3561 3693
3562 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 3695 };
3564 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
3565} 3728}
3566 3729
3567{ 3730{
3568 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
3569 3732
… …
3572 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3573 reentrant => 0, 3736 reentrant => 0,
3574 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3575 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3576 poll => 'r', 3739 poll => 'r',
3577 prio => 6, 3740 prio => 0,
3578 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3579 ); 3742 );
3580} 3743}
3581 3744
3582my $_log_backtrace; 3745my $_log_backtrace;
… …
3588 3751
3589 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 3754 ++$_log_backtrace;
3592 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3593 my @bt = fork_call { 3758 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3597 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

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