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

Diff Legend

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