… | |
… | |
19 | # The authors can be reached via e-mail to <support@deliantra.net> |
19 | # The authors can be reached via e-mail to <support@deliantra.net> |
20 | # |
20 | # |
21 | |
21 | |
22 | package cf; |
22 | package cf; |
23 | |
23 | |
|
|
24 | use 5.10.0; |
24 | use utf8; |
25 | use utf8; |
25 | use strict; |
26 | use strict "vars", "subs"; |
26 | |
27 | |
27 | use Symbol; |
28 | use Symbol; |
28 | use List::Util; |
29 | use List::Util; |
29 | use Socket; |
30 | use Socket; |
30 | use EV 3.2; |
31 | use EV; |
31 | use Opcode; |
32 | use Opcode; |
32 | use Safe; |
33 | use Safe; |
33 | use Safe::Hole; |
34 | use Safe::Hole; |
34 | use Storable (); |
35 | use Storable (); |
35 | |
36 | |
36 | use Coro 4.50 (); |
37 | use Coro (); |
37 | use Coro::State; |
38 | use Coro::State; |
38 | use Coro::Handle; |
39 | use Coro::Handle; |
39 | use Coro::EV; |
40 | use Coro::EV; |
|
|
41 | use Coro::AnyEvent; |
40 | use Coro::Timer; |
42 | use Coro::Timer; |
41 | use Coro::Signal; |
43 | use Coro::Signal; |
42 | use Coro::Semaphore; |
44 | use Coro::Semaphore; |
|
|
45 | use Coro::AnyEvent; |
43 | use Coro::AIO; |
46 | use Coro::AIO; |
44 | use Coro::BDB; |
47 | use Coro::BDB 1.6; |
45 | use Coro::Storable; |
48 | use Coro::Storable; |
46 | use Coro::Util (); |
49 | use Coro::Util (); |
47 | |
50 | |
48 | use JSON::XS 2.01 (); |
51 | use JSON::XS 2.01 (); |
49 | use BDB (); |
52 | use BDB (); |
50 | use Data::Dumper; |
53 | use Data::Dumper; |
51 | use Digest::MD5; |
54 | use Digest::MD5; |
52 | use Fcntl; |
55 | use Fcntl; |
53 | use YAML (); |
56 | use YAML (); |
54 | use IO::AIO 2.51 (); |
57 | use IO::AIO (); |
55 | use Time::HiRes; |
58 | use Time::HiRes; |
56 | use Compress::LZF; |
59 | use Compress::LZF; |
57 | use Digest::MD5 (); |
60 | use Digest::MD5 (); |
|
|
61 | |
|
|
62 | AnyEvent::detect; |
58 | |
63 | |
59 | # configure various modules to our taste |
64 | # configure various modules to our taste |
60 | # |
65 | # |
61 | $Storable::canonical = 1; # reduce rsync transfers |
66 | $Storable::canonical = 1; # reduce rsync transfers |
62 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
67 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
… | |
… | |
90 | our $RANDOMDIR = "$LOCALDIR/random"; |
95 | our $RANDOMDIR = "$LOCALDIR/random"; |
91 | our $BDBDIR = "$LOCALDIR/db"; |
96 | our $BDBDIR = "$LOCALDIR/db"; |
92 | our %RESOURCE; |
97 | our %RESOURCE; |
93 | |
98 | |
94 | our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) |
99 | our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) |
95 | our $AIO_POLL_WATCHER; |
|
|
96 | our $NEXT_RUNTIME_WRITE; # when should the runtime file be written |
100 | our $NEXT_RUNTIME_WRITE; # when should the runtime file be written |
97 | our $NEXT_TICK; |
101 | our $NEXT_TICK; |
98 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
102 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
99 | |
103 | |
100 | our $BDB_POLL_WATCHER; |
|
|
101 | our $BDB_DEADLOCK_WATCHER; |
104 | our $BDB_DEADLOCK_WATCHER; |
102 | our $BDB_CHECKPOINT_WATCHER; |
105 | our $BDB_CHECKPOINT_WATCHER; |
103 | our $BDB_TRICKLE_WATCHER; |
106 | our $BDB_TRICKLE_WATCHER; |
104 | our $DB_ENV; |
107 | our $DB_ENV; |
105 | |
108 | |
… | |
… | |
242 | for my $pkg (qw( |
245 | for my $pkg (qw( |
243 | cf::global cf::attachable |
246 | cf::global cf::attachable |
244 | cf::object cf::object::player |
247 | cf::object cf::object::player |
245 | cf::client cf::player |
248 | cf::client cf::player |
246 | cf::arch cf::living |
249 | cf::arch cf::living |
|
|
250 | cf::map cf::mapspace |
247 | cf::map cf::party cf::region |
251 | cf::party cf::region |
248 | )) { |
252 | )) { |
249 | no strict 'refs'; |
|
|
250 | @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; |
253 | @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; |
251 | } |
254 | } |
252 | |
255 | |
253 | $EV::DIED = sub { |
256 | $EV::DIED = sub { |
254 | warn "error in event callback: @_"; |
257 | warn "error in event callback: @_"; |
… | |
… | |
427 | } |
430 | } |
428 | } |
431 | } |
429 | }; |
432 | }; |
430 | |
433 | |
431 | sub get_slot($;$$) { |
434 | sub get_slot($;$$) { |
432 | return if tick_inhibit; |
435 | return if tick_inhibit || $Coro::current == $Coro::main; |
433 | |
436 | |
434 | my ($time, $pri, $name) = @_; |
437 | my ($time, $pri, $name) = @_; |
435 | |
438 | |
436 | $time = $TICK * .6 if $time > $TICK * .6; |
439 | $time = $TICK * .6 if $time > $TICK * .6; |
437 | my $sig = new Coro::Signal; |
440 | my $sig = new Coro::Signal; |
… | |
… | |
1085 | |
1088 | |
1086 | sub reattach { |
1089 | sub reattach { |
1087 | # basically do the same as instantiate, without calling instantiate |
1090 | # basically do the same as instantiate, without calling instantiate |
1088 | my ($obj) = @_; |
1091 | my ($obj) = @_; |
1089 | |
1092 | |
|
|
1093 | # no longer needed after getting rid of delete_package? |
1090 | bless $obj, ref $obj; # re-bless in case extensions have been reloaded |
1094 | #bless $obj, ref $obj; # re-bless in case extensions have been reloaded |
1091 | |
1095 | |
1092 | my $registry = $obj->registry; |
1096 | my $registry = $obj->registry; |
1093 | |
1097 | |
1094 | @$registry = (); |
1098 | @$registry = (); |
1095 | |
1099 | |
… | |
… | |
1141 | utf8::decode (my $decname = $filename); |
1145 | utf8::decode (my $decname = $filename); |
1142 | warn sprintf "saving %s (%d,%d)\n", |
1146 | warn sprintf "saving %s (%d,%d)\n", |
1143 | $decname, length $$rdata, scalar @$objs; |
1147 | $decname, length $$rdata, scalar @$objs; |
1144 | |
1148 | |
1145 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1149 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1146 | chmod SAVE_MODE, $fh; |
1150 | aio_chmod $fh, SAVE_MODE; |
1147 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1151 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1148 | aio_fsync $fh if $cf::USE_FSYNC; |
1152 | aio_fsync $fh if $cf::USE_FSYNC; |
1149 | close $fh; |
1153 | aio_close $fh; |
1150 | |
1154 | |
1151 | if (@$objs) { |
1155 | if (@$objs) { |
1152 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1156 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1153 | chmod SAVE_MODE, $fh; |
1157 | aio_chmod $fh, SAVE_MODE; |
1154 | my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; |
1158 | my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; |
1155 | aio_write $fh, 0, (length $data), $data, 0; |
1159 | aio_write $fh, 0, (length $data), $data, 0; |
1156 | aio_fsync $fh if $cf::USE_FSYNC; |
1160 | aio_fsync $fh if $cf::USE_FSYNC; |
1157 | close $fh; |
1161 | aio_close $fh; |
1158 | aio_rename "$filename.pst~", "$filename.pst"; |
1162 | aio_rename "$filename.pst~", "$filename.pst"; |
1159 | } |
1163 | } |
1160 | } else { |
1164 | } else { |
1161 | aio_unlink "$filename.pst"; |
1165 | aio_unlink "$filename.pst"; |
1162 | } |
1166 | } |
… | |
… | |
1331 | |
1335 | |
1332 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1336 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1333 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1337 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1334 | |
1338 | |
1335 | $ext{source} = |
1339 | $ext{source} = |
1336 | "package $pkg; use strict; use utf8;\n" |
1340 | "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" |
1337 | . "#line 1 \"$path\"\n{\n" |
1341 | . "#line 1 \"$path\"\n{\n" |
1338 | . $source |
1342 | . $source |
1339 | . "\n};\n1"; |
1343 | . "\n};\n1"; |
1340 | |
1344 | |
1341 | $todo{$base} = \%ext; |
1345 | $todo{$base} = \%ext; |
… | |
… | |
1456 | my $f = new_from_file cf::object::thawer path $login |
1460 | my $f = new_from_file cf::object::thawer path $login |
1457 | or return; |
1461 | or return; |
1458 | |
1462 | |
1459 | my $pl = cf::player::load_pl $f |
1463 | my $pl = cf::player::load_pl $f |
1460 | or return; |
1464 | or return; |
|
|
1465 | |
1461 | local $cf::PLAYER_LOADING{$login} = $pl; |
1466 | local $cf::PLAYER_LOADING{$login} = $pl; |
1462 | $f->resolve_delayed_derefs; |
1467 | $f->resolve_delayed_derefs; |
1463 | $cf::PLAYER{$login} = $pl |
1468 | $cf::PLAYER{$login} = $pl |
1464 | } |
1469 | } |
1465 | } |
1470 | } |
… | |
… | |
1518 | my ($pl) = @_; |
1523 | my ($pl) = @_; |
1519 | |
1524 | |
1520 | my $name = $pl->ob->name; |
1525 | my $name = $pl->ob->name; |
1521 | |
1526 | |
1522 | $pl->{deny_save} = 1; |
1527 | $pl->{deny_save} = 1; |
1523 | $pl->password ("*"); # this should lock out the player until we nuked the dir |
1528 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1524 | |
1529 | |
1525 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1530 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1526 | $pl->deactivate; |
1531 | $pl->deactivate; |
|
|
1532 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
|
|
1533 | $pl->ob->check_score; |
1527 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1534 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1528 | $pl->ns->destroy if $pl->ns; |
1535 | $pl->ns->destroy if $pl->ns; |
1529 | |
1536 | |
1530 | my $path = playerdir $pl; |
1537 | my $path = playerdir $pl; |
1531 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1538 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
… | |
… | |
1570 | |
1577 | |
1571 | for my $login (@$dirs) { |
1578 | for my $login (@$dirs) { |
1572 | my $path = path $login; |
1579 | my $path = path $login; |
1573 | |
1580 | |
1574 | # a .pst is a dead give-away for a valid player |
1581 | # a .pst is a dead give-away for a valid player |
1575 | unless (-e "$path.pst") { |
1582 | # if no pst file found, open and chekc for blocked users |
|
|
1583 | if (aio_stat "$path.pst") { |
1576 | my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; |
1584 | my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; |
1577 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1585 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1578 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
1586 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
1579 | } |
1587 | } |
1580 | |
1588 | |
… | |
… | |
1617 | |
1625 | |
1618 | Expand crossfire pod fragments into protocol xml. |
1626 | Expand crossfire pod fragments into protocol xml. |
1619 | |
1627 | |
1620 | =cut |
1628 | =cut |
1621 | |
1629 | |
1622 | use re 'eval'; |
|
|
1623 | |
|
|
1624 | my $group; |
|
|
1625 | my $interior; $interior = qr{ |
|
|
1626 | # match a pod interior sequence sans C<< >> |
|
|
1627 | (?: |
|
|
1628 | \ (.*?)\ (?{ $group = $^N }) |
|
|
1629 | | < (??{$interior}) > |
|
|
1630 | ) |
|
|
1631 | }x; |
|
|
1632 | |
|
|
1633 | sub expand_cfpod { |
1630 | sub expand_cfpod { |
1634 | my ($self, $pod) = @_; |
1631 | my ($self, $pod) = @_; |
1635 | |
1632 | |
|
|
1633 | my @nest = [qr<\G$>, undef, ""]; |
1636 | my $xml; |
1634 | my $xml; |
1637 | |
1635 | |
|
|
1636 | for ($pod) { |
1638 | while () { |
1637 | while () { |
1639 | if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { |
1638 | if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) { |
1640 | $group = $1; |
|
|
1641 | |
|
|
1642 | $group =~ s/&/&/g; |
|
|
1643 | $group =~ s/</</g; |
|
|
1644 | |
|
|
1645 | $xml .= $group; |
1639 | $xml .= $1; |
1646 | } elsif ($pod =~ m%\G |
1640 | } elsif (/\G\n(?=\S)/xgcs) { |
1647 | ([BCGHITU]) |
1641 | $xml .= " "; |
1648 | < |
1642 | } elsif (/\G\n/xgcs) { |
1649 | (?: |
1643 | $xml .= "\n"; |
1650 | ([^<>]*) (?{ $group = $^N }) |
1644 | } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) { |
1651 | | < $interior > |
1645 | my ($code, $delim) = ($1, scalar reverse $2); |
1652 | ) |
1646 | $delim =~ y/</>/; # delim now contains the stop sequence |
1653 | > |
1647 | $delim = qr{\G\Q$delim}; |
1654 | %gcsx |
|
|
1655 | ) { |
|
|
1656 | my ($code, $data) = ($1, $group); |
|
|
1657 | |
1648 | |
|
|
1649 | my $cb; |
|
|
1650 | |
1658 | if ($code eq "B") { |
1651 | if ($code eq "B") { |
1659 | $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; |
1652 | $cb = sub { "<b>$_[0]</b>" }; |
1660 | } elsif ($code eq "I") { |
|
|
1661 | $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>"; |
|
|
1662 | } elsif ($code eq "U") { |
|
|
1663 | $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>"; |
|
|
1664 | } elsif ($code eq "C") { |
1653 | } elsif ($code eq "C") { |
1665 | $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; |
1654 | $cb = sub { "<tt>$_[0]</tt>" }; |
1666 | } elsif ($code eq "T") { |
1655 | } elsif ($code eq "E") { |
1667 | $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; |
1656 | $cb = sub { warn "E<$_[0]>\n";"&$_[0];" }; |
1668 | } elsif ($code eq "G") { |
1657 | } elsif ($code eq "G") { |
|
|
1658 | $cb = sub { |
1669 | my ($male, $female) = split /\|/, $data; |
1659 | my ($male, $female) = split /\|/, $_[0]; |
1670 | $data = $self->gender ? $female : $male; |
1660 | $self->gender ? $female : $male |
1671 | $xml .= expand_cfpod ($self, $data); |
1661 | }; |
1672 | } elsif ($code eq "H") { |
1662 | } elsif ($code eq "H") { |
1673 | $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>", |
1663 | $cb = sub { |
|
|
1664 | ( |
|
|
1665 | "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>", |
1674 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
1666 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
1675 | "") |
1667 | "", |
1676 | [$self->{hintmode}]; |
1668 | )[$self->{hintmode}]; |
|
|
1669 | }; |
|
|
1670 | } elsif ($code eq "I") { |
|
|
1671 | $cb = sub { "<i>$_[0]</i>" }; |
|
|
1672 | } elsif ($code eq "T") { |
|
|
1673 | $cb = sub { "<big><b>$_[0]</b></big>" }; |
|
|
1674 | } elsif ($code eq "U") { |
|
|
1675 | $cb = sub { "<u>$_[0]</u>" }; |
|
|
1676 | } elsif ($code eq "Z") { |
|
|
1677 | $cb = sub { }; |
|
|
1678 | } else { |
|
|
1679 | die "FATAL error in expand_cfpod"; |
|
|
1680 | } |
|
|
1681 | |
|
|
1682 | push @nest, [$delim, $cb, $xml]; |
|
|
1683 | undef $xml; |
|
|
1684 | |
|
|
1685 | } elsif ($_ =~ /$nest[-1][0]/gcs) { |
|
|
1686 | my $nest = pop @nest; |
|
|
1687 | |
|
|
1688 | if ($nest->[1]) { |
|
|
1689 | $xml = $nest->[2] . $nest->[1]->($xml); |
|
|
1690 | } else { |
|
|
1691 | last; |
|
|
1692 | } |
|
|
1693 | } elsif (/\G</xgcs) { |
|
|
1694 | $xml .= "<"; |
|
|
1695 | } elsif (/\G&/xgcs) { |
|
|
1696 | $xml .= "&"; |
|
|
1697 | } elsif (/\G>/xgcs) { |
|
|
1698 | $xml .= ">"; |
1677 | } else { |
1699 | } else { |
1678 | $xml .= "error processing '$code($data)' directive"; |
1700 | if ($pod =~ /\G(.+)/xgcs) { |
|
|
1701 | warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod"; |
|
|
1702 | last; |
|
|
1703 | } else { |
|
|
1704 | warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod"; |
|
|
1705 | return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>"; |
|
|
1706 | } |
1679 | } |
1707 | } |
1680 | } else { |
|
|
1681 | if ($pod =~ /\G(.+)/) { |
|
|
1682 | warn "parse error while expanding $pod (at $1)"; |
|
|
1683 | } |
1708 | } |
1684 | last; |
|
|
1685 | } |
|
|
1686 | } |
|
|
1687 | |
|
|
1688 | for ($xml) { |
|
|
1689 | # create single paragraphs (very hackish) |
|
|
1690 | s/(?<=\S)\n(?=\w)/ /g; |
|
|
1691 | |
|
|
1692 | # compress some whitespace |
|
|
1693 | s/\s+\n/\n/g; # ws line-ends |
|
|
1694 | s/\n\n+/\n/g; # double lines |
|
|
1695 | s/^\n+//; # beginning lines |
|
|
1696 | s/\n+$//; # ending lines |
|
|
1697 | } |
1709 | } |
1698 | |
1710 | |
1699 | $xml |
1711 | $xml |
1700 | } |
1712 | } |
1701 | |
|
|
1702 | no re 'eval'; |
|
|
1703 | |
1713 | |
1704 | sub hintmode { |
1714 | sub hintmode { |
1705 | $_[0]{hintmode} = $_[1] if @_ > 1; |
1715 | $_[0]{hintmode} = $_[1] if @_ > 1; |
1706 | $_[0]{hintmode} |
1716 | $_[0]{hintmode} |
1707 | } |
1717 | } |
… | |
… | |
2029 | |
2039 | |
2030 | cf::lock_wait "map_data:$path";#d#remove |
2040 | cf::lock_wait "map_data:$path";#d#remove |
2031 | cf::lock_wait "map_find:$path"; |
2041 | cf::lock_wait "map_find:$path"; |
2032 | |
2042 | |
2033 | $cf::MAP{$path} || do { |
2043 | $cf::MAP{$path} || do { |
2034 | my $guard1 = cf::lock_acquire "map_find:$path"; |
|
|
2035 | my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
2044 | my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
|
|
2045 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2036 | |
2046 | |
2037 | my $map = new_from_path cf::map $path |
2047 | my $map = new_from_path cf::map $path |
2038 | or return; |
2048 | or return; |
2039 | |
2049 | |
2040 | $map->{last_save} = $cf::RUNTIME; |
2050 | $map->{last_save} = $cf::RUNTIME; |
… | |
… | |
2043 | or return; |
2053 | or return; |
2044 | |
2054 | |
2045 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
2055 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
2046 | # doing this can freeze the server in a sync job, obviously |
2056 | # doing this can freeze the server in a sync job, obviously |
2047 | #$cf::WAIT_FOR_TICK->wait; |
2057 | #$cf::WAIT_FOR_TICK->wait; |
|
|
2058 | undef $guard2; |
2048 | undef $guard1; |
2059 | undef $guard1; |
2049 | undef $guard2; |
|
|
2050 | $map->reset; |
2060 | $map->reset; |
2051 | return find $path; |
2061 | return find $path; |
2052 | } |
2062 | } |
2053 | |
2063 | |
2054 | $cf::MAP{$path} = $map |
2064 | $cf::MAP{$path} = $map |
… | |
… | |
2081 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
2091 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
2082 | $f->skip_block; |
2092 | $f->skip_block; |
2083 | $self->_load_objects ($f) |
2093 | $self->_load_objects ($f) |
2084 | or return; |
2094 | or return; |
2085 | |
2095 | |
2086 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
2096 | $self->post_load_original |
2087 | if delete $self->{load_original}; |
2097 | if delete $self->{load_original}; |
2088 | |
2098 | |
2089 | if (my $uniq = $self->uniq_path) { |
2099 | if (my $uniq = $self->uniq_path) { |
2090 | utf8::encode $uniq; |
2100 | utf8::encode $uniq; |
2091 | unless (aio_stat $uniq) { |
2101 | unless (aio_stat $uniq) { |
… | |
… | |
2457 | can be C<undef>. Does the right thing when the player is currently in a |
2467 | can be C<undef>. Does the right thing when the player is currently in a |
2458 | dialogue with the given NPC character. |
2468 | dialogue with the given NPC character. |
2459 | |
2469 | |
2460 | =cut |
2470 | =cut |
2461 | |
2471 | |
|
|
2472 | our $SAY_CHANNEL = { |
|
|
2473 | id => "say", |
|
|
2474 | title => "Map", |
|
|
2475 | reply => "say ", |
|
|
2476 | tooltip => "Things said to and replied from npcs near you and other players on the same map only.", |
|
|
2477 | }; |
|
|
2478 | |
|
|
2479 | our $CHAT_CHANNEL = { |
|
|
2480 | id => "chat", |
|
|
2481 | title => "Chat", |
|
|
2482 | reply => "chat ", |
|
|
2483 | tooltip => "Player chat and shouts, global to the server.", |
|
|
2484 | }; |
|
|
2485 | |
2462 | # rough implementation of a future "reply" method that works |
2486 | # rough implementation of a future "reply" method that works |
2463 | # with dialog boxes. |
2487 | # with dialog boxes. |
2464 | #TODO: the first argument must go, split into a $npc->reply_to ( method |
2488 | #TODO: the first argument must go, split into a $npc->reply_to ( method |
2465 | sub cf::object::player::reply($$$;$) { |
2489 | sub cf::object::player::reply($$$;$) { |
2466 | my ($self, $npc, $msg, $flags) = @_; |
2490 | my ($self, $npc, $msg, $flags) = @_; |
… | |
… | |
2477 | my $dialog = $pl->{npc_dialog}; |
2501 | my $dialog = $pl->{npc_dialog}; |
2478 | $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); |
2502 | $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); |
2479 | |
2503 | |
2480 | } else { |
2504 | } else { |
2481 | $msg = $npc->name . " says: $msg" if $npc; |
2505 | $msg = $npc->name . " says: $msg" if $npc; |
2482 | $self->message ($msg, $flags); |
2506 | $self->send_msg ($SAY_CHANNEL => $msg, $flags); |
2483 | } |
2507 | } |
2484 | } |
2508 | } |
2485 | } |
2509 | } |
2486 | |
2510 | |
2487 | =item $object->send_msg ($channel, $msg, $color, [extra...]) |
2511 | =item $object->send_msg ($channel, $msg, $color, [extra...]) |
… | |
… | |
2594 | Moves the player to the given map-path and coordinates by first freezing |
2618 | Moves the player to the given map-path and coordinates by first freezing |
2595 | her, loading and preparing them map, calling the provided $check callback |
2619 | her, loading and preparing them map, calling the provided $check callback |
2596 | that has to return the map if sucecssful, and then unfreezes the player on |
2620 | that has to return the map if sucecssful, and then unfreezes the player on |
2597 | the new (success) or old (failed) map position. In either case, $done will |
2621 | the new (success) or old (failed) map position. In either case, $done will |
2598 | be called at the end of this process. |
2622 | be called at the end of this process. |
|
|
2623 | |
|
|
2624 | Note that $check will be called with a potentially non-loaded map, so if |
|
|
2625 | it needs a loaded map it has to call C<< ->load >>. |
2599 | |
2626 | |
2600 | =cut |
2627 | =cut |
2601 | |
2628 | |
2602 | our $GOTOGEN; |
2629 | our $GOTOGEN; |
2603 | |
2630 | |
… | |
… | |
2682 | } |
2709 | } |
2683 | |
2710 | |
2684 | sub prepare_random_map { |
2711 | sub prepare_random_map { |
2685 | my ($exit) = @_; |
2712 | my ($exit) = @_; |
2686 | |
2713 | |
2687 | my $guard = cf::lock_acquire "exit_prepare:$exit"; |
|
|
2688 | |
|
|
2689 | # all this does is basically replace the /! path by |
2714 | # all this does is basically replace the /! path by |
2690 | # a new random map path (?random/...) with a seed |
2715 | # a new random map path (?random/...) with a seed |
2691 | # that depends on the exit object |
2716 | # that depends on the exit object |
2692 | |
2717 | |
2693 | my $rmp = parse_random_map_params $exit->msg; |
2718 | my $rmp = parse_random_map_params $exit->msg; |
… | |
… | |
2695 | if ($exit->map) { |
2720 | if ($exit->map) { |
2696 | $rmp->{region} = $exit->region->name; |
2721 | $rmp->{region} = $exit->region->name; |
2697 | $rmp->{origin_map} = $exit->map->path; |
2722 | $rmp->{origin_map} = $exit->map->path; |
2698 | $rmp->{origin_x} = $exit->x; |
2723 | $rmp->{origin_x} = $exit->x; |
2699 | $rmp->{origin_y} = $exit->y; |
2724 | $rmp->{origin_y} = $exit->y; |
|
|
2725 | |
|
|
2726 | $exit->map->touch; |
2700 | } |
2727 | } |
2701 | |
2728 | |
2702 | $rmp->{random_seed} ||= $exit->random_seed; |
2729 | $rmp->{random_seed} ||= $exit->random_seed; |
2703 | |
2730 | |
2704 | my $data = JSON::XS->new->utf8->pretty->canolicalize->encode ($rmp); |
2731 | my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); |
2705 | my $md5 = Digest::MD5::md5_hex $data; |
2732 | my $md5 = Digest::MD5::md5_hex $data; |
2706 | my $meta = "$RANDOMDIR/$md5.meta"; |
2733 | my $meta = "$RANDOMDIR/$md5.meta"; |
2707 | |
2734 | |
2708 | if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { |
2735 | if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { |
2709 | aio_write $fh, 0, (length $data), $data, 0; |
2736 | aio_write $fh, 0, (length $data), $data, 0; |
2710 | undef $fh; |
2737 | undef $fh; |
2711 | aio_rename "$meta~", $meta; |
2738 | aio_rename "$meta~", $meta; |
2712 | |
2739 | |
|
|
2740 | my $slaying = "?random/$md5"; |
|
|
2741 | |
|
|
2742 | if ($exit->valid) { |
2713 | $exit->slaying ("?random/$md5"); |
2743 | $exit->slaying ("?random/$md5"); |
2714 | $exit->msg (undef); |
2744 | $exit->msg (undef); |
|
|
2745 | } |
2715 | } |
2746 | } |
2716 | } |
2747 | } |
2717 | |
2748 | |
2718 | sub cf::object::player::enter_exit { |
2749 | sub cf::object::player::enter_exit { |
2719 | my ($self, $exit) = @_; |
2750 | my ($self, $exit) = @_; |
2720 | |
2751 | |
2721 | return unless $self->type == cf::PLAYER; |
2752 | return unless $self->type == cf::PLAYER; |
2722 | |
2753 | |
2723 | if ($exit->slaying eq "/!") { |
|
|
2724 | #TODO: this should de-fi-ni-te-ly not be a sync-job |
|
|
2725 | # the problem is that $exit might not survive long enough |
|
|
2726 | # so it needs to be done right now, right here |
|
|
2727 | cf::sync_job { prepare_random_map $exit }; |
|
|
2728 | } |
|
|
2729 | |
|
|
2730 | my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; |
|
|
2731 | my $hp = $exit->stats->hp; |
|
|
2732 | my $sp = $exit->stats->sp; |
|
|
2733 | |
|
|
2734 | $self->enter_link; |
2754 | $self->enter_link; |
2735 | |
2755 | |
2736 | # if exit is damned, update players death & WoR home-position |
|
|
2737 | $self->contr->savebed ($slaying, $hp, $sp) |
|
|
2738 | if $exit->flag (FLAG_DAMNED); |
|
|
2739 | |
|
|
2740 | (async { |
2756 | (async { |
2741 | $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; |
2757 | $Coro::current->{desc} = "enter_exit"; |
2742 | |
2758 | |
2743 | $self->deactivate_recursive; # just to be sure |
|
|
2744 | unless (eval { |
2759 | unless (eval { |
|
|
2760 | $self->deactivate_recursive; # just to be sure |
|
|
2761 | |
|
|
2762 | # random map handling |
|
|
2763 | { |
|
|
2764 | my $guard = cf::lock_acquire "exit_prepare:$exit"; |
|
|
2765 | |
|
|
2766 | prepare_random_map $exit |
|
|
2767 | if $exit->slaying eq "/!"; |
|
|
2768 | } |
|
|
2769 | |
|
|
2770 | my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; |
|
|
2771 | my $x = $exit->stats->hp; |
|
|
2772 | my $y = $exit->stats->sp; |
|
|
2773 | |
2745 | $self->goto ($slaying, $hp, $sp); |
2774 | $self->goto ($map, $x, $y); |
2746 | |
2775 | |
|
|
2776 | # if exit is damned, update players death & WoR home-position |
|
|
2777 | $self->contr->savebed ($map, $x, $y) |
|
|
2778 | if $exit->flag (cf::FLAG_DAMNED); |
|
|
2779 | |
2747 | 1; |
2780 | 1 |
2748 | }) { |
2781 | }) { |
2749 | $self->message ("Something went wrong deep within the crossfire server. " |
2782 | $self->message ("Something went wrong deep within the crossfire server. " |
2750 | . "I'll try to bring you back to the map you were before. " |
2783 | . "I'll try to bring you back to the map you were before. " |
2751 | . "Please report this to the dungeon master!", |
2784 | . "Please report this to the dungeon master!", |
2752 | cf::NDI_UNIQUE | cf::NDI_RED); |
2785 | cf::NDI_UNIQUE | cf::NDI_RED); |
… | |
… | |
2832 | id => "infobox", |
2865 | id => "infobox", |
2833 | title => "Map Info", |
2866 | title => "Map Info", |
2834 | reply => undef, |
2867 | reply => undef, |
2835 | tooltip => "Information related to the maps", |
2868 | tooltip => "Information related to the maps", |
2836 | }, |
2869 | }, |
|
|
2870 | "c/party" => { |
|
|
2871 | id => "party", |
|
|
2872 | title => "Party", |
|
|
2873 | reply => "gsay ", |
|
|
2874 | tooltip => "Messages and chat related to your party", |
|
|
2875 | }, |
2837 | ); |
2876 | ); |
2838 | |
2877 | |
2839 | sub cf::client::send_msg { |
2878 | sub cf::client::send_msg { |
2840 | my ($self, $channel, $msg, $color, @extra) = @_; |
2879 | my ($self, $channel, $msg, $color, @extra) = @_; |
2841 | |
2880 | |
… | |
… | |
2868 | if ($self->can_msg) { |
2907 | if ($self->can_msg) { |
2869 | # default colour, mask it out |
2908 | # default colour, mask it out |
2870 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
2909 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
2871 | if $color & cf::NDI_DEF; |
2910 | if $color & cf::NDI_DEF; |
2872 | |
2911 | |
2873 | $self->send_packet ("msg " . $self->{json_coder}->encode ( |
2912 | my $pkt = "msg " |
|
|
2913 | . $self->{json_coder}->encode ( |
2874 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); |
2914 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] |
|
|
2915 | ); |
|
|
2916 | |
|
|
2917 | # try lzf for large packets |
|
|
2918 | $pkt = "lzf " . Compress::LZF::compress $pkt |
|
|
2919 | if 1024 <= length $pkt and $self->{can_lzf}; |
|
|
2920 | |
|
|
2921 | # split very large packets |
|
|
2922 | if (8192 < length $pkt and $self->{can_lzf}) { |
|
|
2923 | $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; |
|
|
2924 | $pkt = "frag"; |
|
|
2925 | } |
|
|
2926 | |
|
|
2927 | $self->send_packet ($pkt); |
2875 | } else { |
2928 | } else { |
2876 | if ($color >= 0) { |
2929 | if ($color >= 0) { |
2877 | # replace some tags by gcfclient-compatible ones |
2930 | # replace some tags by gcfclient-compatible ones |
2878 | for ($msg) { |
2931 | for ($msg) { |
2879 | 1 while |
2932 | 1 while |
… | |
… | |
3078 | |
3131 | |
3079 | The following functions and methods are available within a safe environment: |
3132 | The following functions and methods are available within a safe environment: |
3080 | |
3133 | |
3081 | cf::object |
3134 | cf::object |
3082 | contr pay_amount pay_player map x y force_find force_add destroy |
3135 | contr pay_amount pay_player map x y force_find force_add destroy |
3083 | insert remove name archname title slaying race decrease_ob_nr |
3136 | insert remove name archname title slaying race decrease split |
3084 | |
3137 | |
3085 | cf::object::player |
3138 | cf::object::player |
3086 | player |
3139 | player |
3087 | |
3140 | |
3088 | cf::player |
3141 | cf::player |
… | |
… | |
3093 | |
3146 | |
3094 | =cut |
3147 | =cut |
3095 | |
3148 | |
3096 | for ( |
3149 | for ( |
3097 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
3150 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
3098 | insert remove inv name archname title slaying race |
3151 | insert remove inv nrof name archname title slaying race |
3099 | decrease_ob_nr destroy)], |
3152 | decrease split destroy change_exp)], |
3100 | ["cf::object::player" => qw(player)], |
3153 | ["cf::object::player" => qw(player)], |
3101 | ["cf::player" => qw(peaceful)], |
3154 | ["cf::player" => qw(peaceful)], |
3102 | ["cf::map" => qw(trigger)], |
3155 | ["cf::map" => qw(trigger)], |
3103 | ) { |
3156 | ) { |
3104 | no strict 'refs'; |
3157 | no strict 'refs'; |
… | |
… | |
3312 | while (my ($k, $v) = each %$want) { |
3365 | while (my ($k, $v) = each %$want) { |
3313 | $ns->fx_want ($k, $v); |
3366 | $ns->fx_want ($k, $v); |
3314 | } |
3367 | } |
3315 | }; |
3368 | }; |
3316 | |
3369 | |
|
|
3370 | sub load_resource_file($) { |
|
|
3371 | my $guard = lock_acquire "load_resource_file"; |
|
|
3372 | |
|
|
3373 | my $status = load_resource_file_ $_[0]; |
|
|
3374 | get_slot 0.1, 100; |
|
|
3375 | cf::arch::commit_load; |
|
|
3376 | |
|
|
3377 | $status |
|
|
3378 | } |
|
|
3379 | |
3317 | sub reload_regions { |
3380 | sub reload_regions { |
3318 | # HACK to clear player env face cache, we need some signal framework |
3381 | # HACK to clear player env face cache, we need some signal framework |
3319 | # for this (global event?) |
3382 | # for this (global event?) |
3320 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3383 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3321 | |
3384 | |
… | |
… | |
3334 | } |
3397 | } |
3335 | |
3398 | |
3336 | sub reload_archetypes { |
3399 | sub reload_archetypes { |
3337 | load_resource_file "$DATADIR/archetypes" |
3400 | load_resource_file "$DATADIR/archetypes" |
3338 | or die "unable to load archetypes\n"; |
3401 | or die "unable to load archetypes\n"; |
3339 | #d# NEED to laod twice to resolve forward references |
|
|
3340 | # this really needs to be done in an extra post-pass |
|
|
3341 | # (which needs to be synchronous, so solve it differently) |
|
|
3342 | load_resource_file "$DATADIR/archetypes" |
|
|
3343 | or die "unable to load archetypes\n"; |
|
|
3344 | } |
3402 | } |
3345 | |
3403 | |
3346 | sub reload_treasures { |
3404 | sub reload_treasures { |
3347 | load_resource_file "$DATADIR/treasures" |
3405 | load_resource_file "$DATADIR/treasures" |
3348 | or die "unable to load treasurelists\n"; |
3406 | or die "unable to load treasurelists\n"; |
3349 | } |
3407 | } |
3350 | |
3408 | |
3351 | sub reload_resources { |
3409 | sub reload_resources { |
3352 | warn "reloading resource files...\n"; |
3410 | warn "reloading resource files...\n"; |
3353 | |
3411 | |
|
|
3412 | reload_facedata; |
|
|
3413 | reload_archetypes; |
3354 | reload_regions; |
3414 | reload_regions; |
3355 | reload_facedata; |
|
|
3356 | #reload_archetypes;#d# |
|
|
3357 | reload_archetypes; |
|
|
3358 | reload_treasures; |
3415 | reload_treasures; |
3359 | |
3416 | |
3360 | warn "finished reloading resource files\n"; |
3417 | warn "finished reloading resource files\n"; |
3361 | } |
3418 | } |
3362 | |
3419 | |
3363 | sub init { |
3420 | sub init { |
|
|
3421 | my $guard = freeze_mainloop; |
|
|
3422 | |
|
|
3423 | evthread_start IO::AIO::poll_fileno; |
|
|
3424 | |
3364 | reload_resources; |
3425 | reload_resources; |
3365 | } |
3426 | } |
3366 | |
3427 | |
3367 | sub reload_config { |
3428 | sub reload_config { |
3368 | open my $fh, "<:utf8", "$CONFDIR/config" |
3429 | open my $fh, "<:utf8", "$CONFDIR/config" |
… | |
… | |
3393 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3454 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3394 | EV::loop EV::LOOP_ONESHOT; |
3455 | EV::loop EV::LOOP_ONESHOT; |
3395 | })->prio (Coro::PRIO_MAX); |
3456 | })->prio (Coro::PRIO_MAX); |
3396 | }; |
3457 | }; |
3397 | |
3458 | |
|
|
3459 | { |
|
|
3460 | my $guard = freeze_mainloop; |
3398 | reload_config; |
3461 | reload_config; |
3399 | db_init; |
3462 | db_init; |
3400 | load_extensions; |
3463 | load_extensions; |
3401 | |
3464 | |
3402 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3465 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3403 | evthread_start IO::AIO::poll_fileno; |
3466 | } |
|
|
3467 | |
3404 | EV::loop; |
3468 | EV::loop; |
3405 | } |
3469 | } |
3406 | |
3470 | |
3407 | ############################################################################# |
3471 | ############################################################################# |
3408 | # initialisation and cleanup |
3472 | # initialisation and cleanup |
… | |
… | |
3541 | |
3605 | |
3542 | warn Carp::longmess "post_cleanup backtrace" |
3606 | warn Carp::longmess "post_cleanup backtrace" |
3543 | if $make_core; |
3607 | if $make_core; |
3544 | } |
3608 | } |
3545 | |
3609 | |
|
|
3610 | # a safer delete_package, copied from Symbol |
|
|
3611 | sub clear_package($) { |
|
|
3612 | my $pkg = shift; |
|
|
3613 | |
|
|
3614 | # expand to full symbol table name if needed |
|
|
3615 | unless ($pkg =~ /^main::.*::$/) { |
|
|
3616 | $pkg = "main$pkg" if $pkg =~ /^::/; |
|
|
3617 | $pkg = "main::$pkg" unless $pkg =~ /^main::/; |
|
|
3618 | $pkg .= '::' unless $pkg =~ /::$/; |
|
|
3619 | } |
|
|
3620 | |
|
|
3621 | my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/; |
|
|
3622 | my $stem_symtab = *{$stem}{HASH}; |
|
|
3623 | |
|
|
3624 | defined $stem_symtab and exists $stem_symtab->{$leaf} |
|
|
3625 | or return; |
|
|
3626 | |
|
|
3627 | # clear all symbols |
|
|
3628 | my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; |
|
|
3629 | for my $name (keys %$leaf_symtab) { |
|
|
3630 | _gv_clear *{"$pkg$name"}; |
|
|
3631 | # use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; |
|
|
3632 | } |
|
|
3633 | warn "cleared package #$pkg\n";#d# |
|
|
3634 | } |
|
|
3635 | |
|
|
3636 | our $RELOAD; # how many times to reload |
|
|
3637 | |
3546 | sub do_reload_perl() { |
3638 | sub do_reload_perl() { |
3547 | # can/must only be called in main |
3639 | # can/must only be called in main |
3548 | if ($Coro::current != $Coro::main) { |
3640 | if ($Coro::current != $Coro::main) { |
3549 | warn "can only reload from main coroutine"; |
3641 | warn "can only reload from main coroutine"; |
3550 | return; |
3642 | return; |
3551 | } |
3643 | } |
3552 | |
3644 | |
|
|
3645 | return if $RELOAD++; |
|
|
3646 | |
|
|
3647 | while ($RELOAD) { |
3553 | warn "reloading..."; |
3648 | warn "reloading..."; |
3554 | |
3649 | |
3555 | warn "entering sync_job"; |
3650 | warn "entering sync_job"; |
3556 | |
3651 | |
3557 | cf::sync_job { |
3652 | cf::sync_job { |
3558 | cf::write_runtime_sync; # external watchdog should not bark |
3653 | cf::write_runtime_sync; # external watchdog should not bark |
3559 | cf::emergency_save; |
3654 | cf::emergency_save; |
3560 | cf::write_runtime_sync; # external watchdog should not bark |
3655 | cf::write_runtime_sync; # external watchdog should not bark |
3561 | |
3656 | |
3562 | warn "syncing database to disk"; |
3657 | warn "syncing database to disk"; |
3563 | BDB::db_env_txn_checkpoint $DB_ENV; |
3658 | BDB::db_env_txn_checkpoint $DB_ENV; |
3564 | |
3659 | |
3565 | # if anything goes wrong in here, we should simply crash as we already saved |
3660 | # if anything goes wrong in here, we should simply crash as we already saved |
3566 | |
3661 | |
3567 | warn "flushing outstanding aio requests"; |
3662 | warn "flushing outstanding aio requests"; |
3568 | for (;;) { |
|
|
3569 | BDB::flush; |
|
|
3570 | IO::AIO::flush; |
|
|
3571 | Coro::cede_notself; |
|
|
3572 | last unless IO::AIO::nreqs || BDB::nreqs; |
3663 | while (IO::AIO::nreqs || BDB::nreqs) { |
3573 | warn "iterate..."; |
3664 | Coro::EV::timer_once 0.01; # let the sync_job do it's thing |
3574 | } |
|
|
3575 | |
|
|
3576 | ++$RELOAD; |
|
|
3577 | |
|
|
3578 | warn "cancelling all extension coros"; |
|
|
3579 | $_->cancel for values %EXT_CORO; |
|
|
3580 | %EXT_CORO = (); |
|
|
3581 | |
|
|
3582 | warn "removing commands"; |
|
|
3583 | %COMMAND = (); |
|
|
3584 | |
|
|
3585 | warn "removing ext/exti commands"; |
|
|
3586 | %EXTCMD = (); |
|
|
3587 | %EXTICMD = (); |
|
|
3588 | |
|
|
3589 | warn "unloading/nuking all extensions"; |
|
|
3590 | for my $pkg (@EXTS) { |
|
|
3591 | warn "... unloading $pkg"; |
|
|
3592 | |
|
|
3593 | if (my $cb = $pkg->can ("unload")) { |
|
|
3594 | eval { |
|
|
3595 | $cb->($pkg); |
|
|
3596 | 1 |
|
|
3597 | } or warn "$pkg unloaded, but with errors: $@"; |
|
|
3598 | } |
3665 | } |
3599 | |
3666 | |
3600 | warn "... nuking $pkg"; |
3667 | warn "cancelling all extension coros"; |
3601 | Symbol::delete_package $pkg; |
3668 | $_->cancel for values %EXT_CORO; |
3602 | } |
3669 | %EXT_CORO = (); |
3603 | |
3670 | |
3604 | warn "unloading all perl modules loaded from $LIBDIR"; |
3671 | warn "removing commands"; |
3605 | while (my ($k, $v) = each %INC) { |
3672 | %COMMAND = (); |
3606 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
|
|
3607 | |
3673 | |
|
|
3674 | warn "removing ext/exti commands"; |
|
|
3675 | %EXTCMD = (); |
|
|
3676 | %EXTICMD = (); |
|
|
3677 | |
|
|
3678 | warn "unloading/nuking all extensions"; |
|
|
3679 | for my $pkg (@EXTS) { |
3608 | warn "... unloading $k"; |
3680 | warn "... unloading $pkg"; |
3609 | delete $INC{$k}; |
|
|
3610 | |
3681 | |
3611 | $k =~ s/\.pm$//; |
|
|
3612 | $k =~ s/\//::/g; |
|
|
3613 | |
|
|
3614 | if (my $cb = $k->can ("unload_module")) { |
3682 | if (my $cb = $pkg->can ("unload")) { |
|
|
3683 | eval { |
3615 | $cb->(); |
3684 | $cb->($pkg); |
|
|
3685 | 1 |
|
|
3686 | } or warn "$pkg unloaded, but with errors: $@"; |
|
|
3687 | } |
|
|
3688 | |
|
|
3689 | warn "... clearing $pkg"; |
|
|
3690 | clear_package $pkg; |
3616 | } |
3691 | } |
3617 | |
3692 | |
3618 | Symbol::delete_package $k; |
3693 | warn "unloading all perl modules loaded from $LIBDIR"; |
|
|
3694 | while (my ($k, $v) = each %INC) { |
|
|
3695 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
|
|
3696 | |
|
|
3697 | warn "... unloading $k"; |
|
|
3698 | delete $INC{$k}; |
|
|
3699 | |
|
|
3700 | $k =~ s/\.pm$//; |
|
|
3701 | $k =~ s/\//::/g; |
|
|
3702 | |
|
|
3703 | if (my $cb = $k->can ("unload_module")) { |
|
|
3704 | $cb->(); |
|
|
3705 | } |
|
|
3706 | |
|
|
3707 | clear_package $k; |
3619 | } |
3708 | } |
3620 | |
3709 | |
3621 | warn "getting rid of safe::, as good as possible"; |
3710 | warn "getting rid of safe::, as good as possible"; |
3622 | Symbol::delete_package "safe::$_" |
3711 | clear_package "safe::$_" |
3623 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3712 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3624 | |
3713 | |
3625 | warn "unloading cf.pm \"a bit\""; |
3714 | warn "unloading cf.pm \"a bit\""; |
3626 | delete $INC{"cf.pm"}; |
3715 | delete $INC{"cf.pm"}; |
3627 | delete $INC{"cf/pod.pm"}; |
3716 | delete $INC{"cf/pod.pm"}; |
3628 | |
3717 | |
3629 | # don't, removes xs symbols, too, |
3718 | # don't, removes xs symbols, too, |
3630 | # and global variables created in xs |
3719 | # and global variables created in xs |
3631 | #Symbol::delete_package __PACKAGE__; |
3720 | #clear_package __PACKAGE__; |
3632 | |
3721 | |
3633 | warn "unload completed, starting to reload now"; |
3722 | warn "unload completed, starting to reload now"; |
3634 | |
3723 | |
3635 | warn "reloading cf.pm"; |
3724 | warn "reloading cf.pm"; |
3636 | require cf; |
3725 | require cf; |
3637 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3726 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3638 | |
3727 | |
3639 | warn "loading config and database again"; |
3728 | warn "loading config and database again"; |
3640 | cf::reload_config; |
3729 | cf::reload_config; |
3641 | |
3730 | |
3642 | warn "loading extensions"; |
3731 | warn "loading extensions"; |
3643 | cf::load_extensions; |
3732 | cf::load_extensions; |
3644 | |
3733 | |
3645 | warn "reattaching attachments to objects/players"; |
3734 | warn "reattaching attachments to objects/players"; |
3646 | _global_reattach; # objects, sockets |
3735 | _global_reattach; # objects, sockets |
3647 | warn "reattaching attachments to maps"; |
3736 | warn "reattaching attachments to maps"; |
3648 | reattach $_ for values %MAP; |
3737 | reattach $_ for values %MAP; |
3649 | warn "reattaching attachments to players"; |
3738 | warn "reattaching attachments to players"; |
3650 | reattach $_ for values %PLAYER; |
3739 | reattach $_ for values %PLAYER; |
3651 | |
3740 | |
3652 | warn "leaving sync_job"; |
3741 | warn "leaving sync_job"; |
3653 | |
3742 | |
3654 | 1 |
3743 | 1 |
3655 | } or do { |
3744 | } or do { |
3656 | warn $@; |
3745 | warn $@; |
3657 | cf::cleanup "error while reloading, exiting."; |
3746 | cf::cleanup "error while reloading, exiting."; |
3658 | }; |
3747 | }; |
3659 | |
3748 | |
3660 | warn "reloaded"; |
3749 | warn "reloaded"; |
|
|
3750 | --$RELOAD; |
|
|
3751 | } |
3661 | }; |
3752 | }; |
3662 | |
3753 | |
3663 | our $RELOAD_WATCHER; # used only during reload |
3754 | our $RELOAD_WATCHER; # used only during reload |
3664 | |
3755 | |
3665 | sub reload_perl() { |
3756 | sub reload_perl() { |
… | |
… | |
3690 | |
3781 | |
3691 | our @WAIT_FOR_TICK; |
3782 | our @WAIT_FOR_TICK; |
3692 | our @WAIT_FOR_TICK_BEGIN; |
3783 | our @WAIT_FOR_TICK_BEGIN; |
3693 | |
3784 | |
3694 | sub wait_for_tick { |
3785 | sub wait_for_tick { |
3695 | return if tick_inhibit; |
|
|
3696 | return if $Coro::current == $Coro::main; |
3786 | return if tick_inhibit || $Coro::current == $Coro::main; |
3697 | |
3787 | |
3698 | my $signal = new Coro::Signal; |
3788 | my $signal = new Coro::Signal; |
3699 | push @WAIT_FOR_TICK, $signal; |
3789 | push @WAIT_FOR_TICK, $signal; |
3700 | $signal->wait; |
3790 | $signal->wait; |
3701 | } |
3791 | } |
3702 | |
3792 | |
3703 | sub wait_for_tick_begin { |
3793 | sub wait_for_tick_begin { |
3704 | return if tick_inhibit; |
|
|
3705 | return if $Coro::current == $Coro::main; |
3794 | return if tick_inhibit || $Coro::current == $Coro::main; |
3706 | |
3795 | |
3707 | my $signal = new Coro::Signal; |
3796 | my $signal = new Coro::Signal; |
3708 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3797 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3709 | $signal->wait; |
3798 | $signal->wait; |
3710 | } |
3799 | } |
… | |
… | |
3749 | { |
3838 | { |
3750 | # configure BDB |
3839 | # configure BDB |
3751 | |
3840 | |
3752 | BDB::min_parallel 8; |
3841 | BDB::min_parallel 8; |
3753 | BDB::max_poll_reqs $TICK * 0.1; |
3842 | BDB::max_poll_reqs $TICK * 0.1; |
3754 | $Coro::BDB::WATCHER->priority (1); |
3843 | $AnyEvent::BDB::WATCHER->priority (1); |
3755 | |
3844 | |
3756 | unless ($DB_ENV) { |
3845 | unless ($DB_ENV) { |
3757 | $DB_ENV = BDB::db_env_create; |
3846 | $DB_ENV = BDB::db_env_create; |
3758 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC |
3847 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); |
3759 | | BDB::LOG_AUTOREMOVE, 1); |
3848 | $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; |
|
|
3849 | $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7; |
3760 | $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); |
3850 | $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); |
3761 | $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); |
3851 | $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); |
3762 | |
3852 | |
3763 | cf::sync_job { |
3853 | cf::sync_job { |
3764 | eval { |
3854 | eval { |
… | |
… | |
3790 | { |
3880 | { |
3791 | # configure IO::AIO |
3881 | # configure IO::AIO |
3792 | |
3882 | |
3793 | IO::AIO::min_parallel 8; |
3883 | IO::AIO::min_parallel 8; |
3794 | IO::AIO::max_poll_time $TICK * 0.1; |
3884 | IO::AIO::max_poll_time $TICK * 0.1; |
3795 | $Coro::AIO::WATCHER->priority (1); |
3885 | undef $AnyEvent::AIO::WATCHER; |
3796 | } |
3886 | } |
3797 | |
3887 | |
3798 | my $_log_backtrace; |
3888 | my $_log_backtrace; |
3799 | |
3889 | |
3800 | sub _log_backtrace { |
3890 | sub _log_backtrace { |