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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.510 by root, Tue Apr 6 22:59:28 2010 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,2009,2010 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;
… …
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;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
115our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 121our $DB_ENV;
119 122
120our @EXTRA_MODULES = qw(pod mapscript); 123our @EXTRA_MODULES = qw(pod match mapscript);
121 124
122our %CFG; 125our %CFG;
123 126
124our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 128our $RUNTIME;
… …
161 164
162sub cf::map::normalise; 165sub cf::map::normalise;
163 166
164############################################################################# 167#############################################################################
165 168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
177
178#############################################################################
179
166=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
167 181
168=over 4 182=over 4
169 183
170=item $cf::UPTIME 184=item $cf::UPTIME
… …
214returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 230
217=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
218 232
219This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 235that call.
222 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
223=back 243=back
224 244
225=cut 245=cut
226 246
227BEGIN { 247$Coro::State::WARNHOOK = sub {
228 *CORE::GLOBAL::warn = sub {
229 my $msg = join "", @_; 248 my $msg = join "", @_;
230 249
231 $msg .= "\n" 250 $msg .= "\n"
232 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
233 252
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 254
236 LOG llevError, $msg; 255 LOG llevError, $msg;
237 }; 256};
238}
239 257
240$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
242 262
243 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 265 return;#d#
246 }#d# 266 }#d#
247 267
248 # kill coroutine otherwise 268 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 269 Coro::terminate
251}; 270};
252
253$SIG{__DIE__} = sub { }; #d#?
254 271
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
272)) { 289)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 291}
275 292
276$EV::DIED = sub { 293$EV::DIED = sub {
277 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
278}; 295};
279 296
280############################################################################# 297#############################################################################
281 298
282=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
406 423
407=cut 424=cut
408 425
409our @SLOT_QUEUE; 426our @SLOT_QUEUE;
410our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
411 429
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
415 433
416 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
417 436
418 while () { 437 while () {
419 next_job: 438 next_job:
439
420 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 441
422 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 446 $job->[2]->send;
426 Coro::cede; 447 Coro::cede;
427 goto next_job; 448 goto next_job;
428 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 451 }
430 } 452 }
431 453
432 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait; 457 $signal->wait;
436 } else { 458 } else {
459 $busy = 0;
437 Coro::schedule; 460 Coro::schedule;
438 } 461 }
439 } 462 }
440}; 463};
441 464
442sub get_slot($;$$) { 465sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
444 467
445 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
446 469
447 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
448 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
449 473
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1286} 1310}
1287 1311
1288use File::Glob (); 1312use File::Glob ();
1289 1313
1290cf::player->attach ( 1314cf::player->attach (
1291 on_command => sub { 1315 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1293 1317
1294 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1295 or return; 1319 or return;
1296 1320
… …
1375 . "\n};\n1"; 1399 . "\n};\n1";
1376 1400
1377 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1378 } 1402 }
1379 1403
1404 my $pass = 0;
1380 my %done; 1405 my %done;
1381 while (%todo) { 1406 while (%todo) {
1382 my $progress; 1407 my $progress;
1383 1408
1409 ++$pass;
1410
1411 ext:
1384 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1414 next ext
1387 unless exists $done{$_}; 1415 unless exists $done{$_};
1388 } 1416 }
1389 1417
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1419
1392 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1424
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1426 if exists $v->{meta}{mandatory};
1400 1427 } else {
1401 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1402 } 1434 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1435 }
1408 1436
1409 skip: 1437 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1412 } 1445 }
1413 }; 1446 };
1414} 1447}
1415 1448
1416############################################################################# 1449#############################################################################
… …
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 1770
1738 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1772 $self->_create_random_map (
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1992 2025
1993 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1994 } 2027 }
1995} 2028}
1996 2029
1997sub pre_load { } 2030sub pre_load { }
1998sub post_load { } 2031#sub post_load { } # XS
1999 2032
2000sub load { 2033sub load {
2001 my ($self) = @_; 2034 my ($self) = @_;
2002 2035
2003 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2060 } 2093 }
2061 2094
2062 $self->post_load; 2095 $self->post_load;
2063} 2096}
2064 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
2065sub customise_for { 2101sub customise_for {
2066 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2067 2103
2068 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2105 if $self->per_player;
… …
2223 2259
2224 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2261
2226 return if $self->players; 2262 return if $self->players;
2227 2263
2228 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2229 2265
2230 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2231 2267
2232 # need to save uniques path 2268 # need to save uniques path
2233 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
… …
2324 : normalise $_ 2360 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2362 ]
2327} 2363}
2328 2364
2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2396
2329=back 2397=back
2330 2398
2331=head3 cf::object 2399=head3 cf::object
2332 2400
2333=cut 2401=cut
… …
2528 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2530 2598
2531 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2534 2602
2535 $map->load; 2603 $map->load;
2536 $map->load_neighbours; 2604 $map->load_neighbours;
2537 2605
2538 return unless $self->contr->active; 2606 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2607
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
2610
2611 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive;
2544} 2613}
2545 2614
2546=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2547 2616
2548Moves the player to the given map-path and coordinates by first freezing 2617Moves the player to the given map-path and coordinates by first freezing
… …
2736 2805
2737 utf8::encode $text; 2806 utf8::encode $text;
2738 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2739} 2808}
2740 2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2833}
2834
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 2836
2743Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2744client if neccessary. C<$type> should be a string identifying the type of 2838client if neccessary. C<$type> should be a string identifying the type of
2745the message, with C<log> being the default. If C<$color> is negative, suppress 2839the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2747 2841
2748=cut 2842=cut
2749 2843
2750# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2752 "c/identify" => { 2852 "c/identify" => {
2753 id => "infobox", 2853 id => "infobox",
2754 title => "Identify", 2854 title => "Identify",
2755 reply => undef, 2855 reply => undef,
2756 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
… …
2758 "c/examine" => { 2858 "c/examine" => {
2759 id => "infobox", 2859 id => "infobox",
2760 title => "Examine", 2860 title => "Examine",
2761 reply => undef, 2861 reply => undef,
2762 tooltip => "Signs and other items you examined", 2862 tooltip => "Signs and other items you examined",
2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2763 }, 2869 },
2764 "c/book" => { 2870 "c/book" => {
2765 id => "infobox", 2871 id => "infobox",
2766 title => "Book", 2872 title => "Book",
2767 reply => undef, 2873 reply => undef,
… …
2883 my $pkt = "msg " 2989 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 2990 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 2992 );
2887 2993
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt); 2994 $self->send_big_packet ($pkt);
2899} 2995}
2900 2996
2901=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2902 2998
2903Sends an ext event to the client. 2999Sends an ext event to the client.
… …
2906 3002
2907sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2909 3005
2910 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 } 3011 }
2916} 3012}
2917 3013
2918=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2919 3015
… …
2923 3019
2924sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2926 3022
2927 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove 3026 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3029 }
2934} 3030}
2935 3031
2936=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2937 3033
… …
3038 3134
3039 $coro 3135 $coro
3040} 3136}
3041 3137
3042cf::client->attach ( 3138cf::client->attach (
3043 on_destroy => sub { 3139 on_client_destroy => sub {
3044 my ($ns) = @_; 3140 my ($ns) = @_;
3045 3141
3046 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047 }, 3143 },
3048); 3144);
… …
3064our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3065 3161
3066$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3067 3163
3068$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3070 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3071 sort time 3167 sort time
3072)); 3168));
3073 3169
3074# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
… …
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3128 3224
3129 %vars = (_dummy => 0) unless %vars; 3225 %vars = (_dummy => 0) unless %vars;
3130 3226
3227 my @res;
3131 local $_; 3228 local $_;
3132 local @safe::cf::_safe_eval_args = values %vars;
3133 3229
3134 my $eval = 3230 my $eval =
3135 "do {\n" 3231 "do {\n"
3136 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3138 . $code 3234 . $code
3139 . "\n}" 3235 . "\n}"
3140 ; 3236 ;
3141 3237
3238 if ($CFG{safe_eval}) {
3142 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3143 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
3145 3247
3146 if ($@) { 3248 if ($@) {
3147 warn "$@"; 3249 warn "$@";
3148 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3149 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
… …
3168=cut 3270=cut
3169 3271
3170sub register_script_function { 3272sub register_script_function {
3171 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3172 3274
3173 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3174 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3175} 3277}
3176 3278
3177=back 3279=back
3178 3280
3179=cut 3281=cut
… …
3200 3302
3201 $facedata->{version} == 2 3303 $facedata->{version} == 2
3202 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3203 3305
3204 # patch in the exptable 3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3205 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3206 type => FT_RSRC, 3309 type => FT_RSRC,
3207 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3208 }; 3312 };
3209 cf::cede_to_tick; 3313 cf::cede_to_tick;
3210 3314
3211 { 3315 {
3212 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
… …
3214 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3320
3217 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3221 3325
3222 cf::cede_to_tick; 3326 cf::cede_to_tick;
3223 } 3327 }
3224 3328
3225 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
… …
3249 3353
3250 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3251 } 3355 }
3252 3356
3253 { 3357 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3257 3359
3258 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) { 3361 if (defined $info->{type}) {
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3363
3263 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type}; 3365 cf::face::set_type $idx, $info->{type};
3278 } else { 3366 } else {
3279 $RESOURCE{$name} = $info; 3367 $RESOURCE{$name} = $info;
3280 } 3368 }
3281 3369
… …
3365 3453
3366 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3367} 3455}
3368 3456
3369sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3371 or return; 3461 or return;
3372 3462
3373 local $/; 3463 local $/;
3374 *CFG = YAML::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3375 3465
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3377 3467
3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3383 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3384 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3385 }; 3475 };
3386 warn $@ if $@; 3476 warn $@ if $@;
3387 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3388} 3480}
3389 3481
3390sub pidfile() { 3482sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!"; 3484 or die "$PIDFILE: $!";
… …
3440 }; 3532 };
3441 3533
3442 evthread_start IO::AIO::poll_fileno; 3534 evthread_start IO::AIO::poll_fileno;
3443 3535
3444 cf::sync_job { 3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3445 reload_resources; 3540 reload_resources;
3446 reload_config; 3541 reload_config;
3447 db_init; 3542 db_init;
3448 3543
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3544 cf::init_uuid;
3452 cf::init_signals; 3545 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills; 3546 cf::init_skills;
3455 3547
3456 cf::init_beforeplay; 3548 cf::init_beforeplay;
3457 3549
3458 atomic; 3550 atomic;
… …
3460 load_extensions; 3552 load_extensions;
3461 3553
3462 utime time, time, $RUNTIMEFILE; 3554 utime time, time, $RUNTIMEFILE;
3463 3555
3464 # no (long-running) fork's whatsoever before this point(!) 3556 # no (long-running) fork's whatsoever before this point(!)
3557 use POSIX ();
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3558 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466 3559
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3560 (pop @POST_INIT)->(0) while @POST_INIT;
3468 }; 3561 };
3469 3562
… …
3482 }; 3575 };
3483 } 3576 }
3484} 3577}
3485 3578
3486sub write_runtime_sync { 3579sub write_runtime_sync {
3580 my $t0 = EV::time;
3581
3487 # first touch the runtime file to show we are still running: 3582 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3583 # the fsync below can take a very very long time.
3489 3584
3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3586
3492 my $guard = cf::lock_acquire "write_runtime"; 3587 my $guard = cf::lock_acquire "write_runtime";
3493 3588
3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3589 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3590 or return;
3496 3591
3497 my $value = $cf::RUNTIME + 90 + 10; 3592 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3593 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3594 # 60 allows for the watchdog to kill the server.
… …
3512 or return; 3607 or return;
3513 3608
3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3610 and return;
3516 3611
3517 warn "runtime file written.\n"; 3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3518 3613
3519 1 3614 1
3520} 3615}
3521 3616
3522our $uuid_lock; 3617our $uuid_lock;
… …
3741 3836
3742 warn "unload completed, starting to reload now"; 3837 warn "unload completed, starting to reload now";
3743 3838
3744 warn "reloading cf.pm"; 3839 warn "reloading cf.pm";
3745 require cf; 3840 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3841 cf::_connect_to_perl_1;
3747 3842
3748 warn "loading config and database again"; 3843 warn "loading config and database again";
3749 cf::reload_config; 3844 cf::reload_config;
3750 3845
3751 warn "loading extensions"; 3846 warn "loading extensions";
… …
3813 3908
3814our @WAIT_FOR_TICK; 3909our @WAIT_FOR_TICK;
3815our @WAIT_FOR_TICK_BEGIN; 3910our @WAIT_FOR_TICK_BEGIN;
3816 3911
3817sub wait_for_tick { 3912sub wait_for_tick {
3818 return if tick_inhibit || $Coro::current == $Coro::main; 3913 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3819 3914
3820 my $signal = new Coro::Signal; 3915 my $signal = new Coro::Signal;
3821 push @WAIT_FOR_TICK, $signal; 3916 push @WAIT_FOR_TICK, $signal;
3822 $signal->wait; 3917 $signal->wait;
3823} 3918}
3824 3919
3825sub wait_for_tick_begin { 3920sub wait_for_tick_begin {
3826 return if tick_inhibit || $Coro::current == $Coro::main; 3921 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3827 3922
3828 my $signal = new Coro::Signal; 3923 my $signal = new Coro::Signal;
3829 push @WAIT_FOR_TICK_BEGIN, $signal; 3924 push @WAIT_FOR_TICK_BEGIN, $signal;
3830 $signal->wait; 3925 $signal->wait;
3831} 3926}
… …
3836 unless ++$bug_warning > 10; 3931 unless ++$bug_warning > 10;
3837 return; 3932 return;
3838 } 3933 }
3839 3934
3840 cf::server_tick; # one server iteration 3935 cf::server_tick; # one server iteration
3936
3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3841 3938
3842 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3939 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3844 Coro::async_pool { 3941 Coro::async_pool {
3845 $Coro::current->{desc} = "runtime saver"; 3942 $Coro::current->{desc} = "runtime saver";
… …
3868} 3965}
3869 3966
3870{ 3967{
3871 # configure BDB 3968 # configure BDB
3872 3969
3873 BDB::min_parallel 8; 3970 BDB::min_parallel 16;
3874 BDB::max_poll_reqs $TICK * 0.1; 3971 BDB::max_poll_reqs $TICK * 0.1;
3875 $AnyEvent::BDB::WATCHER->priority (1); 3972 $AnyEvent::BDB::WATCHER->priority (1);
3876 3973
3877 unless ($DB_ENV) { 3974 unless ($DB_ENV) {
3878 $DB_ENV = BDB::db_env_create; 3975 $DB_ENV = BDB::db_env_create;
… …
3959 } 4056 }
3960} 4057}
3961 4058
3962# load additional modules 4059# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4060require "cf/$_.pm" for @EXTRA_MODULES;
4061cf::_connect_to_perl_2;
3964 4062
3965END { cf::emergency_save } 4063END { cf::emergency_save }
3966 4064
39671 40651
3968 4066

Diff Legend

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