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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 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#############################################################################
… …
1500 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1501 } 1534 }
1502 } 1535 }
1503} 1536}
1504 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1505sub save($) { 1551sub save($) {
1506 my ($pl) = @_; 1552 my ($pl) = @_;
1507 1553
1508 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1509 1555
… …
1514 1560
1515 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1517 1563
1518 cf::get_slot 0.01; 1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519 1568
1520 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1570 cf::cede_to_tick;
1522} 1571}
1523 1572
… …
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 1786
1738 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1788 $self->_create_random_map (
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1992 2041
1993 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1994 } 2043 }
1995} 2044}
1996 2045
1997sub pre_load { } 2046sub pre_load { }
1998sub post_load { } 2047#sub post_load { } # XS
1999 2048
2000sub load { 2049sub load {
2001 my ($self) = @_; 2050 my ($self) = @_;
2002 2051
2003 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
… …
2060 } 2109 }
2061 2110
2062 $self->post_load; 2111 $self->post_load;
2063} 2112}
2064 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2065sub customise_for { 2117sub customise_for {
2066 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2067 2119
2068 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2121 if $self->per_player;
… …
2223 2275
2224 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2277
2226 return if $self->players; 2278 return if $self->players;
2227 2279
2228 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2229 2281
2230 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2231 2283
2232 # need to save uniques path 2284 # need to save uniques path
2233 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
… …
2324 : normalise $_ 2376 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2378 ]
2327} 2379}
2328 2380
2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2412
2329=back 2413=back
2330 2414
2331=head3 cf::object 2415=head3 cf::object
2332 2416
2333=cut 2417=cut
… …
2528 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2530 2614
2531 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2534 2618
2535 $map->load; 2619 $map->load;
2536 $map->load_neighbours; 2620 $map->load_neighbours;
2537 2621
2538 return unless $self->contr->active; 2622 return unless $self->contr->active;
… …
2737 2821
2738 utf8::encode $text; 2822 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2824}
2741 2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2849}
2850
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2852
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2745client if neccessary. C<$type> should be a string identifying the type of 2854client if neccessary. C<$type> should be a string identifying the type of
2746the message, with C<log> being the default. If C<$color> is negative, suppress 2855the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2748 2857
2749=cut 2858=cut
2750 2859
2751# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2753 "c/identify" => { 2868 "c/identify" => {
2754 id => "infobox", 2869 id => "infobox",
2755 title => "Identify", 2870 title => "Identify",
2756 reply => undef, 2871 reply => undef,
2757 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
… …
2759 "c/examine" => { 2874 "c/examine" => {
2760 id => "infobox", 2875 id => "infobox",
2761 title => "Examine", 2876 title => "Examine",
2762 reply => undef, 2877 reply => undef,
2763 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2885 },
2765 "c/book" => { 2886 "c/book" => {
2766 id => "infobox", 2887 id => "infobox",
2767 title => "Book", 2888 title => "Book",
2768 reply => undef, 2889 reply => undef,
… …
2884 my $pkt = "msg " 3005 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 3008 );
2888 3009
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if (8192 < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt); 3010 $self->send_big_packet ($pkt);
2900} 3011}
2901 3012
2902=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2903 3014
2904Sends an ext event to the client. 3015Sends an ext event to the client.
… …
2907 3018
2908sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2910 3021
2911 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3027 }
2917} 3028}
2918 3029
2919=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2920 3031
… …
2924 3035
2925sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2927 3038
2928 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3042 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3045 }
2935} 3046}
2936 3047
2937=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2938 3049
… …
3039 3150
3040 $coro 3151 $coro
3041} 3152}
3042 3153
3043cf::client->attach ( 3154cf::client->attach (
3044 on_destroy => sub { 3155 on_client_destroy => sub {
3045 my ($ns) = @_; 3156 my ($ns) = @_;
3046 3157
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3159 },
3049); 3160);
… …
3065our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3066 3177
3067$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3068 3179
3069$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3072 sort time 3183 sort time
3073)); 3184));
3074 3185
3075# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
… …
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3129 3240
3130 %vars = (_dummy => 0) unless %vars; 3241 %vars = (_dummy => 0) unless %vars;
3131 3242
3243 my @res;
3132 local $_; 3244 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3245
3135 my $eval = 3246 my $eval =
3136 "do {\n" 3247 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3250 . $code
3140 . "\n}" 3251 . "\n}"
3141 ; 3252 ;
3142 3253
3254 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3146 3263
3147 if ($@) { 3264 if ($@) {
3148 warn "$@"; 3265 warn "$@";
3149 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
… …
3169=cut 3286=cut
3170 3287
3171sub register_script_function { 3288sub register_script_function {
3172 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3173 3290
3174 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3176} 3293}
3177 3294
3178=back 3295=back
3179 3296
3180=cut 3297=cut
… …
3201 3318
3202 $facedata->{version} == 2 3319 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3321
3205 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3206 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC, 3325 type => FT_RSRC,
3208 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3209 }; 3328 };
3210 cf::cede_to_tick; 3329 cf::cede_to_tick;
3211 3330
3212 { 3331 {
3213 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
… …
3215 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3336
3218 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3222 3341
3223 cf::cede_to_tick; 3342 cf::cede_to_tick;
3224 } 3343 }
3225 3344
3226 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
… …
3250 3369
3251 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3252 } 3371 }
3253 3372
3254 { 3373 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3258 3375
3259 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3379
3264 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3265 # prepend meta info
3266
3267 my $meta = $enc->encode ({
3268 name => $name,
3269 %{ $info->{meta} || {} },
3270 });
3271
3272 $data = pack "(w/a*)*", $meta, $info->{data};
3273 } else {
3274 $data = $info->{data};
3275 }
3276
3277 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3279 } else { 3382 } else {
3280 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3281 } 3384 }
3282 3385
… …
3366 3469
3367 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3368} 3471}
3369 3472
3370sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3372 or return; 3477 or return;
3373 3478
3374 local $/; 3479 local $/;
3375 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3376 3481
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3378 3483
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3384 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3385 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3386 }; 3491 };
3387 warn $@ if $@; 3492 warn $@ if $@;
3388 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3389} 3496}
3390 3497
3391sub pidfile() { 3498sub pidfile() {
3392 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3393 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
… …
3441 }; 3548 };
3442 3549
3443 evthread_start IO::AIO::poll_fileno; 3550 evthread_start IO::AIO::poll_fileno;
3444 3551
3445 cf::sync_job { 3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3446 reload_resources; 3556 reload_resources;
3447 reload_config; 3557 reload_config;
3448 db_init; 3558 db_init;
3449 3559
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3560 cf::init_uuid;
3453 cf::init_signals; 3561 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills; 3562 cf::init_skills;
3456 3563
3457 cf::init_beforeplay; 3564 cf::init_beforeplay;
3458 3565
3459 atomic; 3566 atomic;
… …
3484 }; 3591 };
3485 } 3592 }
3486} 3593}
3487 3594
3488sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = EV::time;
3597
3489 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3490 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3491 3600
3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493 3602
3494 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3495 3604
3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497 or return; 3606 or return;
3498 3607
3499 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3500 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3501 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3514 or return; 3623 or return;
3515 3624
3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517 and return; 3626 and return;
3518 3627
3519 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3520 3629
3521 1 3630 1
3522} 3631}
3523 3632
3524our $uuid_lock; 3633our $uuid_lock;
… …
3743 3852
3744 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3745 3854
3746 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3747 require cf; 3856 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3749 3858
3750 warn "loading config and database again"; 3859 warn "loading config and database again";
3751 cf::reload_config; 3860 cf::reload_config;
3752 3861
3753 warn "loading extensions"; 3862 warn "loading extensions";
… …
3815 3924
3816our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3818 3927
3819sub wait_for_tick { 3928sub wait_for_tick {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3821 3930
3822 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3823 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait; 3933 $signal->wait;
3825} 3934}
3826 3935
3827sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3829 3938
3830 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 3941 $signal->wait;
3833} 3942}
… …
3838 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3839 return; 3948 return;
3840 } 3949 }
3841 3950
3842 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3843 3954
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 3957 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
… …
3870} 3981}
3871 3982
3872{ 3983{
3873 # configure BDB 3984 # configure BDB
3874 3985
3875 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3876 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3877 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3878 3989
3879 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3880 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
… …
3961 } 4072 }
3962} 4073}
3963 4074
3964# load additional modules 4075# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3966 4078
3967END { cf::emergency_save } 4079END { cf::emergency_save }
3968 4080
39691 40811
3970 4082

Diff Legend

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