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.437 by root, Tue Jul 8 08:33:27 2008 UTC vs.
Revision 1.457 by root, Wed Oct 1 05:50:19 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;
… …
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
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
136
125binmode STDOUT; 137binmode STDOUT;
126binmode STDERR; 138binmode STDERR;
127 139
128# read virtual server time, if available 140# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 141unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 142 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 143 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 144 $RUNTIME = <$fh> + 0.;
133} 145}
134 146
135mkdir $_ 147mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
243for my $pkg (qw( 255for my $pkg (qw(
244 cf::global cf::attachable 256 cf::global cf::attachable
245 cf::object cf::object::player 257 cf::object cf::object::player
246 cf::client cf::player 258 cf::client cf::player
247 cf::arch cf::living 259 cf::arch cf::living
260 cf::map cf::mapspace
248 cf::map cf::party cf::region 261 cf::party cf::region
249)) { 262)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 264}
253 265
254$EV::DIED = sub { 266$EV::DIED = sub {
255 warn "error in event callback: @_"; 267 warn "error in event callback: @_";
… …
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 309our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 310
299sub encode_json($) { $json_coder->encode ($_[0]) } 311sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 312sub decode_json($) { $json_coder->decode ($_[0]) }
301 313
314=item cf::post_init { BLOCK }
315
316Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again.
318
319The cdoeblock will have a single boolean argument to indicate whether this
320is a reload or not.
321
322=cut
323
324sub post_init(&) {
325 push @POST_INIT, shift;
326}
327
302=item cf::lock_wait $string 328=item cf::lock_wait $string
303 329
304Wait until the given lock is available. See cf::lock_acquire. 330Wait until the given lock is available. See cf::lock_acquire.
305 331
306=item my $lock = cf::lock_acquire $string 332=item my $lock = cf::lock_acquire $string
… …
333 return;#d# 359 return;#d#
334 }#d# 360 }#d#
335 361
336 # wait for lock, if any 362 # wait for lock, if any
337 while ($LOCK{$key}) { 363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
338 push @{ $LOCK{$key} }, $Coro::current; 365 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule; 366 Coro::schedule;
340 } 367 }
341} 368}
342 369
… …
725 752
726############################################################################# 753#############################################################################
727 754
728=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
729 756
730Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
733 760
734In the following description, CLASS can be any of C<global>, C<object> 761In 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 762C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
785=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
786 813
787Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
789 816
790Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
792 819
793These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
794 821
795=over 4 822=over 4
… …
1086 1113
1087sub reattach { 1114sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1116 my ($obj) = @_;
1090 1117
1118 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1120
1093 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1094 1122
1095 @$registry = (); 1123 @$registry = ();
1096 1124
… …
1161 } else { 1189 } else {
1162 aio_unlink "$filename.pst"; 1190 aio_unlink "$filename.pst";
1163 } 1191 }
1164 1192
1165 aio_rename "$filename~", $filename; 1193 aio_rename "$filename~", $filename;
1194
1195 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1197 } else {
1167 warn "FATAL: $filename~: $!\n"; 1198 warn "FATAL: $filename~: $!\n";
1168 } 1199 }
1169 } else { 1200 } else {
1170 aio_unlink $filename; 1201 aio_unlink $filename;
… …
1263 my ($name, $cb) = @_; 1294 my ($name, $cb) = @_;
1264 1295
1265 $EXTICMD{$name} = $cb; 1296 $EXTICMD{$name} = $cb;
1266} 1297}
1267 1298
1299use File::Glob ();
1300
1268cf::player->attach ( 1301cf::player->attach (
1269 on_command => sub { 1302 on_command => sub {
1270 my ($pl, $name, $params) = @_; 1303 my ($pl, $name, $params) = @_;
1271 1304
1272 my $cb = $COMMAND{$name} 1305 my $cb = $COMMAND{$name}
… …
1304 1337
1305 cf::override; 1338 cf::override;
1306 }, 1339 },
1307); 1340);
1308 1341
1342# "readahead" all extensions
1343sub cache_extensions {
1344 my $grp = IO::AIO::aio_group;
1345
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1347 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 }
1350 };
1351
1352 $grp
1353}
1354
1309sub load_extensions { 1355sub load_extensions {
1310 cf::sync_job { 1356 cf::sync_job {
1311 my %todo; 1357 my %todo;
1312 1358
1313 for my $path (<$LIBDIR/*.ext>) { 1359 for my $path (<$LIBDIR/*.ext>) {
… …
1332 1378
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1381
1336 $ext{source} = 1382 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1384 . "#line 1 \"$path\"\n{\n"
1339 . $source 1385 . $source
1340 . "\n};\n1"; 1386 . "\n};\n1";
1341 1387
1342 $todo{$base} = \%ext; 1388 $todo{$base} = \%ext;
… …
1382 1428
1383=back 1429=back
1384 1430
1385=head2 CORE EXTENSIONS 1431=head2 CORE EXTENSIONS
1386 1432
1387Functions and methods that extend core crossfire objects. 1433Functions and methods that extend core deliantra objects.
1388 1434
1389=cut 1435=cut
1390 1436
1391package cf::player; 1437package cf::player;
1392 1438
… …
1435 1481
1436sub exists($) { 1482sub exists($) {
1437 my ($login) = @_; 1483 my ($login) = @_;
1438 1484
1439 $cf::PLAYER{$login} 1485 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1486 or !aio_stat path $login
1441} 1487}
1442 1488
1443sub find($) { 1489sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1490 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1491 my $login = $_[0];
… …
1520 my ($pl) = @_; 1566 my ($pl) = @_;
1521 1567
1522 my $name = $pl->ob->name; 1568 my $name = $pl->ob->name;
1523 1569
1524 $pl->{deny_save} = 1; 1570 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1571 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1572
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1574 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1576 $pl->ob->check_score;
… …
1616 } 1662 }
1617 1663
1618 \@paths 1664 \@paths
1619} 1665}
1620 1666
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1667=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1668
1623Expand crossfire pod fragments into protocol xml. 1669Expand 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 1670
1714=item $player->ext_reply ($msgid, @msg) 1671=item $player->ext_reply ($msgid, @msg)
1715 1672
1716Sends an ext reply to the player. 1673Sends an ext reply to the player.
1717 1674
… …
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2043 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2044 $f->skip_block;
2088 $self->_load_objects ($f) 2045 $self->_load_objects ($f)
2089 or return; 2046 or return;
2090 2047
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2048 $self->post_load_original
2092 if delete $self->{load_original}; 2049 if delete $self->{load_original};
2093 2050
2094 if (my $uniq = $self->uniq_path) { 2051 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2052 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2053 unless (aio_stat $uniq) {
… …
2531 2488
2532=item $player_object->enter_link 2489=item $player_object->enter_link
2533 2490
2534Freezes the player and moves him/her to a special map (C<{link}>). 2491Freezes the player and moves him/her to a special map (C<{link}>).
2535 2492
2536The player should be reasonably safe there for short amounts of time. You 2493The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2494for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link
2496map.
2538 2497
2539Will never block. 2498Will never block.
2540 2499
2541=item $player_object->leave_link ($map, $x, $y) 2500=item $player_object->leave_link ($map, $x, $y)
2542 2501
… …
2600 2559
2601 $map->load; 2560 $map->load;
2602 $map->load_neighbours; 2561 $map->load_neighbours;
2603 2562
2604 return unless $self->contr->active; 2563 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2605 $self->activate_recursive; 2565 $self->activate_recursive;
2606 2566
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2568 $self->enter_map ($map, $x, $y);
2609} 2569}
… …
2772 $self->contr->savebed ($map, $x, $y) 2732 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2733 if $exit->flag (cf::FLAG_DAMNED);
2774 2734
2775 1 2735 1
2776 }) { 2736 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2737 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2738 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2739 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2740 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2741
2782 warn "ERROR in enter_exit: $@"; 2742 warn "ERROR in enter_exit: $@";
… …
2848 id => "infobox", 2808 id => "infobox",
2849 title => "Body Parts", 2809 title => "Body Parts",
2850 reply => undef, 2810 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2811 tooltip => "Shows which body parts you posess and are available",
2852 }, 2812 },
2813 "c/skills" => {
2814 id => "infobox",
2815 title => "Skills",
2816 reply => undef,
2817 tooltip => "Shows your experience per skill and item power",
2818 },
2853 "c/uptime" => { 2819 "c/uptime" => {
2854 id => "infobox", 2820 id => "infobox",
2855 title => "Uptime", 2821 title => "Uptime",
2856 reply => undef, 2822 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2823 tooltip => "How long the server has been running since last restart",
… …
2871); 2837);
2872 2838
2873sub cf::client::send_msg { 2839sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2841
2876 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg)
2843 unless $color & cf::NDI_VERBATIM;
2877 2844
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2845 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2846
2880 # check predefined channels, for the benefit of C 2847 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2848 if ($CHANNEL{$channel}) {
… …
2902 if ($self->can_msg) { 2869 if ($self->can_msg) {
2903 # default colour, mask it out 2870 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 2872 if $color & cf::NDI_DEF;
2906 2873
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2874 my $pkt = "msg "
2875 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 );
2878
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt);
2909 } else { 2890 } else {
2910 if ($color >= 0) { 2891 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones 2892 # replace some tags by gcfclient-compatible ones
2912 for ($msg) { 2893 for ($msg) {
2913 1 while 2894 1 while
… …
3128=cut 3109=cut
3129 3110
3130for ( 3111for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race 3113 insert remove inv nrof name archname title slaying race
3133 decrease split destroy)], 3114 decrease split destroy change_exp)],
3134 ["cf::object::player" => qw(player)], 3115 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3116 ["cf::player" => qw(peaceful)],
3136 ["cf::map" => qw(trigger)], 3117 ["cf::map" => qw(trigger)],
3137) { 3118) {
3138 no strict 'refs'; 3119 no strict 'refs';
… …
3396 reload_treasures; 3377 reload_treasures;
3397 3378
3398 warn "finished reloading resource files\n"; 3379 warn "finished reloading resource files\n";
3399} 3380}
3400 3381
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407}
3408
3409sub reload_config { 3382sub reload_config {
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3383 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3384 or return;
3412 3385
3413 local $/; 3386 local $/;
… …
3425 }; 3398 };
3426 warn $@ if $@; 3399 warn $@ if $@;
3427 } 3400 }
3428} 3401}
3429 3402
3403sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!";
3406 flock $fh, &Fcntl::LOCK_EX
3407 or die "$PIDFILE: flock: $!";
3408 $fh
3409}
3410
3411# make sure only one server instance is running at any one time
3412sub atomic {
3413 my $fh = pidfile;
3414
3415 my $pid = <$fh>;
3416 kill 9, $pid if $pid > 0;
3417
3418 seek $fh, 0, 0;
3419 print $fh $$;
3420}
3421
3430sub main { 3422sub main {
3423 cf::init_globals; # initialise logging
3424
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437
3431 # we must not ever block the main coroutine 3438 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3439 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3440 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3441 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3442 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3443 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3444 })->prio (Coro::PRIO_MAX);
3438 }; 3445 };
3439 3446
3440 { 3447 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3448
3449 cf::sync_job {
3450 reload_resources;
3442 reload_config; 3451 reload_config;
3443 db_init; 3452 db_init;
3453
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid;
3457 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills;
3460
3461 cf::init_beforeplay;
3462
3463 atomic;
3464
3444 load_extensions; 3465 load_extensions;
3445 3466
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3467 utime time, time, $RUNTIMEFILE;
3468
3469 # no (long-running) fork's whatsoever before this point(!)
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471
3472 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3473 };
3448 3474
3449 EV::loop; 3475 EV::loop;
3450} 3476}
3451 3477
3452############################################################################# 3478#############################################################################
… …
3461 }; 3487 };
3462 } 3488 }
3463} 3489}
3464 3490
3465sub write_runtime_sync { 3491sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime";
3467
3468 # first touch the runtime file to show we are still running: 3492 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3493 # the fsync below can take a very very long time.
3470 3494
3471 IO::AIO::aio_utime $runtime, undef, undef; 3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3496
3473 my $guard = cf::lock_acquire "write_runtime"; 3497 my $guard = cf::lock_acquire "write_runtime";
3474 3498
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3476 or return; 3500 or return;
3477 3501
3478 my $value = $cf::RUNTIME + 90 + 10; 3502 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3503 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3504 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3514 aio_utime $fh, undef, undef;
3491 3515
3492 close $fh 3516 close $fh
3493 or return; 3517 or return;
3494 3518
3495 aio_rename "$runtime~", $runtime 3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3520 and return;
3497 3521
3498 warn "runtime file written.\n"; 3522 warn "runtime file written.\n";
3499 3523
3500 1 3524 1
… …
3512 my $uuid = "$LOCALDIR/uuid"; 3536 my $uuid = "$LOCALDIR/uuid";
3513 3537
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3538 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3539 or return;
3516 3540
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3541 my $value = uuid_seq uuid_cur;
3542
3543 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n";
3545 return;
3546 }
3547
3548 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3549 $uuid_skip = 0;
3519 3550
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3551 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3552 and return;
3522 3553
… …
3544} 3575}
3545 3576
3546sub emergency_save() { 3577sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3578 my $freeze_guard = cf::freeze_mainloop;
3548 3579
3549 warn "enter emergency perl save\n"; 3580 warn "emergency_perl_save: enter\n";
3550 3581
3551 cf::sync_job { 3582 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587
3552 # use a peculiar iteration method to avoid tripping on perl 3588 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3589 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3590 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3591 warn "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3592 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3593 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3594 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3596 $pl->save;
3561 } 3597 }
3562 warn "end emergency player save\n"; 3598 warn "emergency_perl_save: end player save\n";
3563 3599
3564 warn "begin emergency map save\n"; 3600 warn "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3601 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3602 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3603 $map->valid or next;
3568 $map->save; 3604 $map->save;
3569 } 3605 }
3570 warn "end emergency map save\n"; 3606 warn "emergency_perl_save: end map save\n";
3571 3607
3572 warn "begin emergency database checkpoint\n"; 3608 warn "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3610 warn "emergency_perl_save: end database checkpoint\n";
3575 3611
3576 warn "begin write uuid\n"; 3612 warn "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3613 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3614 warn "emergency_perl_save: end write uuid\n";
3579 }; 3615 };
3580 3616
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3581 warn "leave emergency perl save\n"; 3622 warn "emergency_perl_save: leave\n";
3582} 3623}
3583 3624
3584sub post_cleanup { 3625sub post_cleanup {
3585 my ($make_core) = @_; 3626 my ($make_core) = @_;
3586 3627
3587 warn Carp::longmess "post_cleanup backtrace" 3628 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3629 if $make_core;
3630
3631 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$;
3633}
3634
3635# a safer delete_package, copied from Symbol
3636sub clear_package($) {
3637 my $pkg = shift;
3638
3639 # expand to full symbol table name if needed
3640 unless ($pkg =~ /^main::.*::$/) {
3641 $pkg = "main$pkg" if $pkg =~ /^::/;
3642 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3643 $pkg .= '::' unless $pkg =~ /::$/;
3644 }
3645
3646 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3647 my $stem_symtab = *{$stem}{HASH};
3648
3649 defined $stem_symtab and exists $stem_symtab->{$leaf}
3650 or return;
3651
3652 # clear all symbols
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 }
3658 warn "cleared package $pkg\n";#d#
3589} 3659}
3590 3660
3591sub do_reload_perl() { 3661sub do_reload_perl() {
3592 # can/must only be called in main 3662 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3663 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3664 warn "can only reload from main coroutine";
3595 return; 3665 return;
3596 } 3666 }
3597 3667
3668 return if $RELOAD++;
3669
3670 my $t1 = EV::time;
3671
3672 while ($RELOAD) {
3598 warn "reloading..."; 3673 warn "reloading...";
3599 3674
3600 warn "entering sync_job"; 3675 warn "entering sync_job";
3601 3676
3602 cf::sync_job { 3677 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3678 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3679 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3680 cf::write_runtime_sync; # external watchdog should not bark
3606 3681
3607 warn "syncing database to disk"; 3682 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3683 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3684
3610 # if anything goes wrong in here, we should simply crash as we already saved 3685 # if anything goes wrong in here, we should simply crash as we already saved
3611 3686
3612 warn "flushing outstanding aio requests"; 3687 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs; 3688 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = ();
3626
3627 warn "removing commands";
3628 %COMMAND = ();
3629
3630 warn "removing ext/exti commands";
3631 %EXTCMD = ();
3632 %EXTICMD = ();
3633
3634 warn "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg";
3637
3638 if (my $cb = $pkg->can ("unload")) {
3639 eval {
3640 $cb->($pkg);
3641 1
3642 } or warn "$pkg unloaded, but with errors: $@";
3643 } 3690 }
3644 3691
3645 warn "... nuking $pkg"; 3692 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3693 $_->cancel for values %EXT_CORO;
3647 } 3694 %EXT_CORO = ();
3648 3695
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3696 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3697 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3698
3699 warn "removing ext/exti commands";
3700 %EXTCMD = ();
3701 %EXTICMD = ();
3702
3703 warn "unloading/nuking all extensions";
3704 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3705 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3706
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3707 if (my $cb = $pkg->can ("unload")) {
3708 eval {
3660 $cb->(); 3709 $cb->($pkg);
3710 1
3711 } or warn "$pkg unloaded, but with errors: $@";
3712 }
3713
3714 warn "... clearing $pkg";
3715 clear_package $pkg;
3661 } 3716 }
3662 3717
3663 Symbol::delete_package $k; 3718 warn "unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721
3722 warn "... unloading $k";
3723 delete $INC{$k};
3724
3725 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g;
3727
3728 if (my $cb = $k->can ("unload_module")) {
3729 $cb->();
3730 }
3731
3732 clear_package $k;
3664 } 3733 }
3665 3734
3666 warn "getting rid of safe::, as good as possible"; 3735 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3736 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3738
3670 warn "unloading cf.pm \"a bit\""; 3739 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3740 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3741 delete $INC{"cf/pod.pm"};
3673 3742
3674 # don't, removes xs symbols, too, 3743 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3744 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3745 #clear_package __PACKAGE__;
3677 3746
3678 warn "unload completed, starting to reload now"; 3747 warn "unload completed, starting to reload now";
3679 3748
3680 warn "reloading cf.pm"; 3749 warn "reloading cf.pm";
3681 require cf; 3750 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3683 3752
3684 warn "loading config and database again"; 3753 warn "loading config and database again";
3685 cf::reload_config; 3754 cf::reload_config;
3686 3755
3687 warn "loading extensions"; 3756 warn "loading extensions";
3688 cf::load_extensions; 3757 cf::load_extensions;
3689 3758
3759 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3760 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3761 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3762 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3763 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3764 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3765 reattach $_ for values %PLAYER;
3766 }
3696 3767
3768 warn "running post_init jobs";
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770
3697 warn "leaving sync_job"; 3771 warn "leaving sync_job";
3698 3772
3699 1 3773 1
3700 } or do { 3774 } or do {
3701 warn $@; 3775 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3776 cf::cleanup "error while reloading, exiting.";
3703 }; 3777 };
3704 3778
3705 warn "reloaded"; 3779 warn "reloaded";
3780 --$RELOAD;
3781 }
3782
3783 $t1 = EV::time - $t1;
3784 warn "reload completed in ${t1}s\n";
3706}; 3785};
3707 3786
3708our $RELOAD_WATCHER; # used only during reload 3787our $RELOAD_WATCHER; # used only during reload
3709 3788
3710sub reload_perl() { 3789sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3790 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3791 # coro crashes during coro_state_free->destroy here.
3713 3792
3793 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions;
3795
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3797 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3798 undef $RELOAD_WATCHER;
3799 };
3717 }; 3800 };
3718} 3801}
3719 3802
3720register_command "reload" => sub { 3803register_command "reload" => sub {
3721 my ($who, $arg) = @_; 3804 my ($who, $arg) = @_;
… …
3847 $msg =~ s/\n//; 3930 $msg =~ s/\n//;
3848 3931
3849 # limit the # of concurrent backtraces 3932 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 3933 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 3934 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg;
3852 async { 3936 async {
3853 $Coro::current->{desc} = "abt $msg"; 3937 $Coro::current->{desc} = "abt $msg";
3854 3938
3855 my @bt = fork_call { 3939 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 3940 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 3951 }
3868 3952
3869 @funcs 3953 @funcs
3870 }; 3954 };
3871 3955
3872 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $perl_bt\n";
3957 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 3958 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 3959 --$_log_backtrace;
3875 }; 3960 };
3876 } else { 3961 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 3962 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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