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.434 by root, Thu May 29 03:27:37 2008 UTC vs.
Revision 1.455 by root, Sat Sep 27 08:17:40 2008 UTC

… …
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
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV; 31use EV;
… …
34use Storable (); 35use Storable ();
35 36
36use Coro (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
39use Coro::AnyEvent; 41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
43use Coro::AnyEvent; 45use Coro::AnyEvent;
44use Coro::AIO; 46use Coro::AIO;
45use Coro::BDB; 47use Coro::BDB 1.6;
46use Coro::Storable; 48use Coro::Storable;
47use Coro::Util (); 49use Coro::Util ();
48 50
49use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
50use BDB (); 52use BDB ();
… …
57use Compress::LZF; 59use Compress::LZF;
58use Digest::MD5 (); 60use Digest::MD5 ();
59 61
60AnyEvent::detect; 62AnyEvent::detect;
61 63
62IO::AIO::max_poll_reqs 1;#d#
63
64# configure various modules to our taste 64# configure various modules to our taste
65# 65#
66$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 74
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 76
74our %COMMAND = (); 77our %COMMAND = ();
75our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 81our %EXTCMD = ();
79our %EXTICMD = (); 82our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
82 85
83our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 87our @EVENT;
85 88
86our $CONFDIR = confdir; 89our $CONFDIR = confdir;
87our $DATADIR = datadir; 90our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
97our %RESOURCE; 103our %RESOURCE;
98 104
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 107our $NEXT_TICK;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 130our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
126 132
133our @POST_INIT;
134
127binmode STDOUT; 135binmode STDOUT;
128binmode STDERR; 136binmode STDERR;
129 137
130# read virtual server time, if available 138# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
135} 143}
136 144
137mkdir $_ 145mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
245for my $pkg (qw( 253for my $pkg (qw(
246 cf::global cf::attachable 254 cf::global cf::attachable
247 cf::object cf::object::player 255 cf::object cf::object::player
248 cf::client cf::player 256 cf::client cf::player
249 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
250 cf::map cf::party cf::region 259 cf::party cf::region
251)) { 260)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 262}
255 263
256$EV::DIED = sub { 264$EV::DIED = sub {
257 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 308
301sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
303 311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
325
304=item cf::lock_wait $string 326=item cf::lock_wait $string
305 327
306Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
307 329
308=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
… …
335 return;#d# 357 return;#d#
336 }#d# 358 }#d#
337 359
338 # wait for lock, if any 360 # wait for lock, if any
339 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
340 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule; 364 Coro::schedule;
342 } 365 }
343} 366}
344 367
… …
727 750
728############################################################################# 751#############################################################################
729 752
730=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
731 754
732Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
735 758
736In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
788 811
789Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
791 814
792Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
794 817
795These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
796 819
797=over 4 820=over 4
… …
1088 1111
1089sub reattach { 1112sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1114 my ($obj) = @_;
1092 1115
1116 # no longer needed after getting rid of delete_package?
1093 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1094 1118
1095 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1096 1120
1097 @$registry = (); 1121 @$registry = ();
1098 1122
… …
1334 1358
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1361
1338 $ext{source} = 1362 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1340 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1341 . $source 1365 . $source
1342 . "\n};\n1"; 1366 . "\n};\n1";
1343 1367
1344 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
… …
1384 1408
1385=back 1409=back
1386 1410
1387=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1388 1412
1389Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1390 1414
1391=cut 1415=cut
1392 1416
1393package cf::player; 1417package cf::player;
1394 1418
… …
1437 1461
1438sub exists($) { 1462sub exists($) {
1439 my ($login) = @_; 1463 my ($login) = @_;
1440 1464
1441 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1443} 1467}
1444 1468
1445sub find($) { 1469sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1471 my $login = $_[0];
… …
1522 my ($pl) = @_; 1546 my ($pl) = @_;
1523 1547
1524 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1525 1549
1526 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1527 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1528 1552
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1530 $pl->deactivate; 1554 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score; 1556 $pl->ob->check_score;
… …
1618 } 1642 }
1619 1643
1620 \@paths 1644 \@paths
1621} 1645}
1622 1646
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1648
1625Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715 1650
1716=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1717 1652
1718Sends an ext reply to the player. 1653Sends an ext reply to the player.
1719 1654
… …
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2024 $f->skip_block;
2090 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
2091 or return; 2026 or return;
2092 2027
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
2094 if delete $self->{load_original}; 2029 if delete $self->{load_original};
2095 2030
2096 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2032 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
… …
2533 2468
2534=item $player_object->enter_link 2469=item $player_object->enter_link
2535 2470
2536Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2537 2472
2538The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2539I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2540 2477
2541Will never block. 2478Will never block.
2542 2479
2543=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2544 2481
… …
2602 2539
2603 $map->load; 2540 $map->load;
2604 $map->load_neighbours; 2541 $map->load_neighbours;
2605 2542
2606 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2607 $self->activate_recursive; 2545 $self->activate_recursive;
2608 2546
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2611} 2549}
… …
2615Moves the player to the given map-path and coordinates by first freezing 2553Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2555that has to return the map if sucecssful, and then unfreezes the player on
2618the new (success) or old (failed) map position. In either case, $done will 2556the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2557be called at the end of this process.
2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
2620 2561
2621=cut 2562=cut
2622 2563
2623our $GOTOGEN; 2564our $GOTOGEN;
2624 2565
… …
2771 $self->contr->savebed ($map, $x, $y) 2712 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2713 if $exit->flag (cf::FLAG_DAMNED);
2773 2714
2774 1 2715 1
2775 }) { 2716 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2721
2781 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
… …
2847 id => "infobox", 2788 id => "infobox",
2848 title => "Body Parts", 2789 title => "Body Parts",
2849 reply => undef, 2790 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 2791 tooltip => "Shows which body parts you posess and are available",
2851 }, 2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2852 "c/uptime" => { 2799 "c/uptime" => {
2853 id => "infobox", 2800 id => "infobox",
2854 title => "Uptime", 2801 title => "Uptime",
2855 reply => undef, 2802 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 2803 tooltip => "How long the server has been running since last restart",
… …
2870); 2817);
2871 2818
2872sub cf::client::send_msg { 2819sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2874 2821
2875 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2876 2824
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 2826
2879 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
… …
2901 if ($self->can_msg) { 2849 if ($self->can_msg) {
2902 # default colour, mask it out 2850 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2905 2853
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2908 } else { 2870 } else {
2909 if ($color >= 0) { 2871 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2911 for ($msg) { 2873 for ($msg) {
2912 1 while 2874 1 while
… …
3127=cut 3089=cut
3128 3090
3129for ( 3091for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3131 insert remove inv nrof name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3094 decrease split destroy change_exp)],
3133 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
3135 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
3136) { 3098) {
3137 no strict 'refs'; 3099 no strict 'refs';
… …
3395 reload_treasures; 3357 reload_treasures;
3396 3358
3397 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3398} 3360}
3399 3361
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3362sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3364 or return;
3409 3365
3410 local $/; 3366 local $/;
… …
3422 }; 3378 };
3423 warn $@ if $@; 3379 warn $@ if $@;
3424 } 3380 }
3425} 3381}
3426 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
3427sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
3428 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3421 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3423 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3435 }; 3425 };
3436 3426
3437 { 3427 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3428
3429 cf::sync_job {
3430 reload_resources;
3439 reload_config; 3431 reload_config;
3440 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
3441 load_extensions; 3445 load_extensions;
3442 3446
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3447 utime time, time, $RUNTIMEFILE;
3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3453 };
3445 3454
3446 EV::loop; 3455 EV::loop;
3447} 3456}
3448 3457
3449############################################################################# 3458#############################################################################
… …
3458 }; 3467 };
3459 } 3468 }
3460} 3469}
3461 3470
3462sub write_runtime_sync { 3471sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime";
3464
3465 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3467 3474
3468 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3476
3470 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3471 3478
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3473 or return; 3480 or return;
3474 3481
3475 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
… …
3487 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3488 3495
3489 close $fh 3496 close $fh
3490 or return; 3497 or return;
3491 3498
3492 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3500 and return;
3494 3501
3495 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3496 3503
3497 1 3504 1
… …
3509 my $uuid = "$LOCALDIR/uuid"; 3516 my $uuid = "$LOCALDIR/uuid";
3510 3517
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3519 or return;
3513 3520
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3521 my $value = uuid_seq uuid_cur;
3522
3523 unless ($value) {
3524 warn "cowardly refusing to write zero uuid value!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3529 $uuid_skip = 0;
3516 3530
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3532 and return;
3519 3533
… …
3581sub post_cleanup { 3595sub post_cleanup {
3582 my ($make_core) = @_; 3596 my ($make_core) = @_;
3583 3597
3584 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
3586} 3629}
3587 3630
3588sub do_reload_perl() { 3631sub do_reload_perl() {
3589 # can/must only be called in main 3632 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3592 return; 3635 return;
3593 } 3636 }
3594 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
3595 warn "reloading..."; 3641 warn "reloading...";
3596 3642
3597 warn "entering sync_job"; 3643 warn "entering sync_job";
3598 3644
3599 cf::sync_job { 3645 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3647 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3603 3649
3604 warn "syncing database to disk"; 3650 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3652
3607 # if anything goes wrong in here, we should simply crash as we already saved 3653 # if anything goes wrong in here, we should simply crash as we already saved
3608 3654
3609 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3658 }
3641 3659
3642 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
3644 } 3662 %EXT_CORO = ();
3645 3663
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3673 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3674
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
3657 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
3658 } 3684 }
3659 3685
3660 Symbol::delete_package $k; 3686 warn "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689
3690 warn "... unloading $k";
3691 delete $INC{$k};
3692
3693 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g;
3695
3696 if (my $cb = $k->can ("unload_module")) {
3697 $cb->();
3698 }
3699
3700 clear_package $k;
3661 } 3701 }
3662 3702
3663 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3706
3667 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
3670 3710
3671 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3712 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
3674 3714
3675 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
3676 3716
3677 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
3678 require cf; 3718 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3680 3720
3681 warn "loading config and database again"; 3721 warn "loading config and database again";
3682 cf::reload_config; 3722 cf::reload_config;
3683 3723
3684 warn "loading extensions"; 3724 warn "loading extensions";
3685 cf::load_extensions; 3725 cf::load_extensions;
3686 3726
3687 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3693 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3694 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3695 3738
3696 1 3739 1
3697 } or do { 3740 } or do {
3698 warn $@; 3741 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
3700 }; 3743 };
3701 3744
3702 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
3703}; 3748};
3704 3749
3705our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3706 3751
3707sub reload_perl() { 3752sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3710 3755
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3757 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3714 }; 3759 };
3715} 3760}
3716 3761
… …
3793 BDB::max_poll_reqs $TICK * 0.1; 3838 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3839 $AnyEvent::BDB::WATCHER->priority (1);
3795 3840
3796 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3845 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3848
3803 cf::sync_job { 3849 cf::sync_job {
3804 eval { 3850 eval {
… …
3830{ 3876{
3831 # configure IO::AIO 3877 # configure IO::AIO
3832 3878
3833 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 3881 undef $AnyEvent::AIO::WATCHER;
3836} 3882}
3837 3883
3838my $_log_backtrace; 3884my $_log_backtrace;
3839 3885
3840sub _log_backtrace { 3886sub _log_backtrace {
… …
3843 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3844 3890
3845 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3848 async { 3895 async {
3849 $Coro::current->{desc} = "abt $msg"; 3896 $Coro::current->{desc} = "abt $msg";
3850 3897
3851 my @bt = fork_call { 3898 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
… …
3863 } 3910 }
3864 3911
3865 @funcs 3912 @funcs
3866 }; 3913 };
3867 3914
3868 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 3918 --$_log_backtrace;
3871 }; 3919 };
3872 } else { 3920 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";
… …
3878# load additional modules 3926# load additional modules
3879use cf::pod; 3927use cf::pod;
3880 3928
3881END { cf::emergency_save } 3929END { cf::emergency_save }
3882 3930
3883evthread_start IO::AIO::poll_fileno;
3884
38851 39311
3886 3932

Diff Legend

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