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.460 by root, Mon Dec 15 17:04:53 2008 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5; 58use Digest::MD5;
57use Fcntl; 59use Fcntl;
58use YAML (); 60use YAML::XS ();
59use IO::AIO (); 61use IO::AIO ();
60use Time::HiRes; 62use Time::HiRes;
61use Compress::LZF; 63use Compress::LZF;
62use Digest::MD5 (); 64use Digest::MD5 ();
63 65
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 74
73# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 81
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 83
79our %COMMAND = (); 84our %COMMAND = ();
80our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
87 92
88our $RELOAD; # number of reloads so far, non-zero while in reload 93our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
90 97
91our $CONFDIR = confdir; 98our $CONFDIR = confdir;
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
… …
105our %RESOURCE; 112our %RESOURCE;
106 113
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 116our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
111 118
112our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 122our $DB_ENV;
116 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
117our %CFG; 126our %CFG;
118 127
119our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 129our $RUNTIME;
121our $NOW; 130our $NOW;
… …
132our $JITTER; # average jitter 141our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
134 143
135our @POST_INIT; 144our @POST_INIT;
136 145
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
138 148
139binmode STDOUT; 149binmode STDOUT;
140binmode STDERR; 150binmode STDERR;
141 151
142# read virtual server time, if available 152# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 154 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
147} 157}
148 158
159eval "sub TICK() { $TICK } 1" or die;
160
149mkdir $_ 161mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 163
152our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
153 165
154sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 178
156############################################################################# 179#############################################################################
157 180
158=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
159 182
… …
206returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 231
209=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
210 233
211This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 236that call.
214 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
215=back 244=back
216 245
217=cut 246=cut
218 247
219BEGIN { 248$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 249 my $msg = join "", @_;
222 250
223 $msg .= "\n" 251 $msg .= "\n"
224 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
225 253
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 255
228 LOG llevError, $msg; 256 LOG llevError, $msg;
229 }; 257};
230}
231 258
232$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
234 263
235 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 266 return;#d#
238 }#d# 267 }#d#
239 268
240 # kill coroutine otherwise 269 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 270 Coro::terminate
243}; 271};
244
245$SIG{__DIE__} = sub { }; #d#?
246 272
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
264)) { 290)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 292}
267 293
268$EV::DIED = sub { 294$EV::DIED = sub {
269 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
270}; 296};
271 297
272############################################################################# 298#############################################################################
273 299
274=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
… …
1147 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1148 1174
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1176 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1180 aio_fsync $fh;
1181 }
1153 aio_close $fh; 1182 aio_close $fh;
1154 1183
1155 if (@$objs) { 1184 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1186 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1191 aio_fsync $fh;
1192 }
1161 aio_close $fh; 1193 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1195 }
1164 } else { 1196 } else {
1165 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
… …
1316 1348
1317# "readahead" all extensions 1349# "readahead" all extensions
1318sub cache_extensions { 1350sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1351 my $grp = IO::AIO::aio_group;
1320 1352
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1354 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1356 }
1325 }; 1357 };
1326 1358
… …
1862 1894
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1865} 1897}
1866 1898
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874}
1875
1876sub decay_objects { 1899sub decay_objects {
1877 my ($self) = @_; 1900 my ($self) = @_;
1878 1901
1879 return if $self->{deny_reset}; 1902 return if $self->{deny_reset};
1880 1903
… …
2043 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2067 $self->decay_objects;
2045 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2046 $self->update_buttons; 2069 $self->update_buttons;
2047 cf::cede_to_tick; 2070 cf::cede_to_tick;
2048 $self->set_darkness_map;
2049 cf::cede_to_tick;
2050 $self->activate; 2071 $self->activate;
2051 } 2072 }
2052 2073
2053 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
… …
2220 2241
2221 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222 2243
2223 return if $self->players; 2244 return if $self->players;
2224 2245
2225 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2226 2247
2227 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2228 2249
2229 # need to save uniques path 2250 # need to save uniques path
2230 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
… …
2321 : normalise $_ 2342 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2344 ]
2324} 2345}
2325 2346
2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2378
2326=back 2379=back
2327 2380
2328=head3 cf::object 2381=head3 cf::object
2329 2382
2330=cut 2383=cut
… …
2395 2448
2396our $SAY_CHANNEL = { 2449our $SAY_CHANNEL = {
2397 id => "say", 2450 id => "say",
2398 title => "Map", 2451 title => "Map",
2399 reply => "say ", 2452 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2454};
2402 2455
2403our $CHAT_CHANNEL = { 2456our $CHAT_CHANNEL = {
2404 id => "chat", 2457 id => "chat",
2405 title => "Chat", 2458 title => "Chat",
… …
2525 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2527 2580
2528 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2531 2584
2532 $map->load; 2585 $map->load;
2533 $map->load_neighbours; 2586 $map->load_neighbours;
2534 2587
2535 return unless $self->contr->active; 2588 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2589
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2541} 2595}
2542 2596
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2544 2598
2545Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
… …
2733 2787
2734 utf8::encode $text; 2788 utf8::encode $text;
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2736} 2790}
2737 2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2815}
2816
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 2818
2740Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2741client if neccessary. C<$type> should be a string identifying the type of 2820client if neccessary. C<$type> should be a string identifying the type of
2742the message, with C<log> being the default. If C<$color> is negative, suppress 2821the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2744 2823
2745=cut 2824=cut
2746 2825
2747# non-persistent channels (usually the info channel) 2826# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2749 "c/identify" => { 2834 "c/identify" => {
2750 id => "infobox", 2835 id => "infobox",
2751 title => "Identify", 2836 title => "Identify",
2752 reply => undef, 2837 reply => undef,
2753 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
… …
2755 "c/examine" => { 2840 "c/examine" => {
2756 id => "infobox", 2841 id => "infobox",
2757 title => "Examine", 2842 title => "Examine",
2758 reply => undef, 2843 reply => undef,
2759 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 2851 },
2761 "c/book" => { 2852 "c/book" => {
2762 id => "infobox", 2853 id => "infobox",
2763 title => "Book", 2854 title => "Book",
2764 reply => undef, 2855 reply => undef,
… …
2780 id => "infobox", 2871 id => "infobox",
2781 title => "Body Parts", 2872 title => "Body Parts",
2782 reply => undef, 2873 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 2874 tooltip => "Shows which body parts you posess and are available",
2784 }, 2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2785 "c/skills" => { 2882 "c/skills" => {
2786 id => "infobox", 2883 id => "infobox",
2787 title => "Skills", 2884 title => "Skills",
2788 reply => undef, 2885 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2790 }, 2911 },
2791 "c/uptime" => { 2912 "c/uptime" => {
2792 id => "infobox", 2913 id => "infobox",
2793 title => "Uptime", 2914 title => "Uptime",
2794 reply => undef, 2915 reply => undef,
… …
2804 id => "party", 2925 id => "party",
2805 title => "Party", 2926 title => "Party",
2806 reply => "gsay ", 2927 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 2928 tooltip => "Messages and chat related to your party",
2808 }, 2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2809); 2938);
2810 2939
2811sub cf::client::send_msg { 2940sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2813 2942
… …
2818 2947
2819 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2822 2951
2823 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2827 2954
2828 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 2960 }
2835 2961
2836 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2837 } 2963 }
2838 2964
2839 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2840 2966
2841 if ($self->can_msg) {
2842 # default colour, mask it out 2967 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2845 2970
2846 my $pkt = "msg " 2971 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 2972 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 2974 );
2850 2975
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt); 2976 $self->send_big_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 2977}
2888 2978
2889=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2890 2980
2891Sends an ext event to the client. 2981Sends an ext event to the client.
… …
2894 2984
2895sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2897 2987
2898 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 2993 }
2904} 2994}
2905 2995
2906=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2907 2997
… …
2911 3001
2912sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2914 3004
2915 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove 3008 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 } 3011 }
2922} 3012}
2923 3013
2924=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2925 3015
… …
3066The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
3067 3157
3068 cf::object 3158 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3159 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3160 insert remove name archname title slaying race decrease split
3161 value
3071 3162
3072 cf::object::player 3163 cf::object::player
3073 player 3164 player
3074 3165
3075 cf::player 3166 cf::player
… …
3081=cut 3172=cut
3082 3173
3083for ( 3174for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3177 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
3090) { 3181) {
3091 no strict 'refs'; 3182 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3110 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
3111 3202
3112 my $qcode = $code; 3203 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
3115 3208
3116 local $_; 3209 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
3118 3211
3119 my $eval = 3212 my $eval =
… …
3350 3443
3351 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3352} 3445}
3353 3446
3354sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3451 or return;
3357 3452
3358 local $/; 3453 local $/;
3359 *CFG = YAML::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3360 3455
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3362 3457
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3465 };
3371 warn $@ if $@; 3466 warn $@ if $@;
3372 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3373} 3470}
3374 3471
3375sub pidfile() { 3472sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3474 or die "$PIDFILE: $!";
… …
3389 3486
3390 seek $fh, 0, 0; 3487 seek $fh, 0, 0;
3391 print $fh $$; 3488 print $fh $$;
3392} 3489}
3393 3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3498}
3499
3394sub main { 3500sub main {
3395 cf::init_globals; # initialise logging 3501 cf::init_globals; # initialise logging
3396 3502
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3401 3507
3402 cf::init_experience; 3508 cf::init_experience;
3403 cf::init_anim; 3509 cf::init_anim;
3404 cf::init_attackmess; 3510 cf::init_attackmess;
3405 cf::init_dynamic; 3511 cf::init_dynamic;
3406 cf::init_block;
3407 3512
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3514
3410 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
… …
3437 load_extensions; 3542 load_extensions;
3438 3543
3439 utime time, time, $RUNTIMEFILE; 3544 utime time, time, $RUNTIMEFILE;
3440 3545
3441 # no (long-running) fork's whatsoever before this point(!) 3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3549
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3550 (pop @POST_INIT)->(0) while @POST_INIT;
3445 }; 3551 };
3446 3552
3447 EV::loop; 3553 main_loop;
3448} 3554}
3449 3555
3450############################################################################# 3556#############################################################################
3451# initialisation and cleanup 3557# initialisation and cleanup
3452 3558
… …
3708 clear_package "safe::$_" 3814 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 3816
3711 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 3820
3715 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3716 # and global variables created in xs 3822 # and global variables created in xs
3717 #clear_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3718 3824
3719 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3720 3826
3721 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3722 require cf; 3828 require cf;
3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3724 3830
3725 warn "loading config and database again"; 3831 warn "loading config and database again";
3726 cf::reload_config; 3832 cf::reload_config;
3727 3833
3728 warn "loading extensions"; 3834 warn "loading extensions";
… …
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3936 } 4042 }
3937} 4043}
3938 4044
3939# load additional modules 4045# load additional modules
3940use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3941 4048
3942END { cf::emergency_save } 4049END { cf::emergency_save }
3943 4050
39441 40511
3945 4052

Diff Legend

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