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.477 by root, Wed Sep 2 22:52:36 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.
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.
222 242
223=back 243=back
224 244
225=cut 245=cut
226 246
… …
269)) { 289)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 291}
272 292
273$EV::DIED = sub { 293$EV::DIED = sub {
274 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
275}; 295};
276 296
277############################################################################# 297#############################################################################
278 298
279=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
403 423
404=cut 424=cut
405 425
406our @SLOT_QUEUE; 426our @SLOT_QUEUE;
407our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
408 429
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
412 433
413 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
414 436
415 while () { 437 while () {
416 next_job: 438 next_job:
439
417 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 441
419 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 446 $job->[2]->send;
423 Coro::cede; 447 Coro::cede;
424 goto next_job; 448 goto next_job;
425 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 451 }
427 } 452 }
428 453
429 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
430 # 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
431 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
432 $signal->wait; 457 $signal->wait;
433 } else { 458 } else {
459 $busy = 0;
434 Coro::schedule; 460 Coro::schedule;
435 } 461 }
436 } 462 }
437}; 463};
438 464
439sub get_slot($;$$) { 465sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
441 467
442 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
443 469
444 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
445 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
446 473
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1283} 1310}
1284 1311
1285use File::Glob (); 1312use File::Glob ();
1286 1313
1287cf::player->attach ( 1314cf::player->attach (
1288 on_command => sub { 1315 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1290 1317
1291 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1292 or return; 1319 or return;
1293 1320
… …
1372 . "\n};\n1"; 1399 . "\n};\n1";
1373 1400
1374 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1375 } 1402 }
1376 1403
1404 my $pass = 0;
1377 my %done; 1405 my %done;
1378 while (%todo) { 1406 while (%todo) {
1379 my $progress; 1407 my $progress;
1380 1408
1409 ++$pass;
1410
1411 ext:
1381 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1414 next ext
1384 unless exists $done{$_}; 1415 unless exists $done{$_};
1385 } 1416 }
1386 1417
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1419
1389 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n";
1392 1424
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1426 if exists $v->{meta}{mandatory};
1397 1427 } else {
1398 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;
1399 } 1434 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1435 }
1405 1436
1406 skip: 1437 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 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 }
1409 } 1445 }
1410 }; 1446 };
1411} 1447}
1412 1448
1413############################################################################# 1449#############################################################################
… …
1497 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1498 } 1534 }
1499 } 1535 }
1500} 1536}
1501 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
1502sub save($) { 1551sub save($) {
1503 my ($pl) = @_; 1552 my ($pl) = @_;
1504 1553
1505 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1506 1555
… …
1511 1560
1512 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1514 1563
1515 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];
1516 1568
1517 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1570 cf::cede_to_tick;
1519} 1571}
1520 1572
… …
1733 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
1734 1786
1735 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1788 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1989 2041
1990 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1991 } 2043 }
1992} 2044}
1993 2045
1994sub pre_load { } 2046sub pre_load { }
1995sub post_load { } 2047#sub post_load { } # XS
1996 2048
1997sub load { 2049sub load {
1998 my ($self) = @_; 2050 my ($self) = @_;
1999 2051
2000 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
… …
2057 } 2109 }
2058 2110
2059 $self->post_load; 2111 $self->post_load;
2060} 2112}
2061 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
2062sub customise_for { 2117sub customise_for {
2063 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2064 2119
2065 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2121 if $self->per_player;
… …
2220 2275
2221 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222 2277
2223 return if $self->players; 2278 return if $self->players;
2224 2279
2225 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2226 2281
2227 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2228 2283
2229 # need to save uniques path 2284 # need to save uniques path
2230 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
… …
2321 : normalise $_ 2376 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2378 ]
2324} 2379}
2325 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
2326=back 2413=back
2327 2414
2328=head3 cf::object 2415=head3 cf::object
2329 2416
2330=cut 2417=cut
… …
2525 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2527 2614
2528 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2531 2618
2532 $map->load; 2619 $map->load;
2533 $map->load_neighbours; 2620 $map->load_neighbours;
2534 2621
2535 return unless $self->contr->active; 2622 return unless $self->contr->active;
… …
2734 2821
2735 utf8::encode $text; 2822 utf8::encode $text;
2736 $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);
2737} 2824}
2738 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
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2852
2741Send 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
2742client 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
2743the 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
… …
2745 2857
2746=cut 2858=cut
2747 2859
2748# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2750 "c/identify" => { 2868 "c/identify" => {
2751 id => "infobox", 2869 id => "infobox",
2752 title => "Identify", 2870 title => "Identify",
2753 reply => undef, 2871 reply => undef,
2754 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
… …
2756 "c/examine" => { 2874 "c/examine" => {
2757 id => "infobox", 2875 id => "infobox",
2758 title => "Examine", 2876 title => "Examine",
2759 reply => undef, 2877 reply => undef,
2760 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",
2761 }, 2885 },
2762 "c/book" => { 2886 "c/book" => {
2763 id => "infobox", 2887 id => "infobox",
2764 title => "Book", 2888 title => "Book",
2765 reply => undef, 2889 reply => undef,
… …
2881 my $pkt = "msg " 3005 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3008 );
2885 3009
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3010 $self->send_big_packet ($pkt);
2897} 3011}
2898 3012
2899=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2900 3014
2901Sends an ext event to the client. 3015Sends an ext event to the client.
… …
2904 3018
2905sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2907 3021
2908 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3027 }
2914} 3028}
2915 3029
2916=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2917 3031
… …
2921 3035
2922sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2924 3038
2925 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3042 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3045 }
2932} 3046}
2933 3047
2934=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2935 3049
… …
3036 3150
3037 $coro 3151 $coro
3038} 3152}
3039 3153
3040cf::client->attach ( 3154cf::client->attach (
3041 on_destroy => sub { 3155 on_client_destroy => sub {
3042 my ($ns) = @_; 3156 my ($ns) = @_;
3043 3157
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3159 },
3046); 3160);
… …
3062our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3063 3177
3064$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3065 3179
3066$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3069 sort time 3183 sort time
3070)); 3184));
3071 3185
3072# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
… …
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3126 3240
3127 %vars = (_dummy => 0) unless %vars; 3241 %vars = (_dummy => 0) unless %vars;
3128 3242
3243 my @res;
3129 local $_; 3244 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3245
3132 my $eval = 3246 my $eval =
3133 "do {\n" 3247 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3250 . $code
3137 . "\n}" 3251 . "\n}"
3138 ; 3252 ;
3139 3253
3254 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 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 }
3143 3263
3144 if ($@) { 3264 if ($@) {
3145 warn "$@"; 3265 warn "$@";
3146 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
… …
3166=cut 3286=cut
3167 3287
3168sub register_script_function { 3288sub register_script_function {
3169 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3170 3290
3171 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3173} 3293}
3174 3294
3175=back 3295=back
3176 3296
3177=cut 3297=cut
… …
3198 3318
3199 $facedata->{version} == 2 3319 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3321
3202 # 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]);
3203 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3325 type => FT_RSRC,
3205 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),
3206 }; 3328 };
3207 cf::cede_to_tick; 3329 cf::cede_to_tick;
3208 3330
3209 { 3331 {
3210 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
… …
3212 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3336
3215 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3341
3220 cf::cede_to_tick; 3342 cf::cede_to_tick;
3221 } 3343 }
3222 3344
3223 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
… …
3247 3369
3248 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3249 } 3371 }
3250 3372
3251 { 3373 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3255 3375
3256 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3379
3261 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3276 } else { 3382 } else {
3277 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3278 } 3384 }
3279 3385
… …
3363 3469
3364 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3365} 3471}
3366 3472
3367sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3477 or return;
3370 3478
3371 local $/; 3479 local $/;
3372 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3373 3481
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3375 3483
3376 $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};
3377 $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};
… …
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3491 };
3384 warn $@ if $@; 3492 warn $@ if $@;
3385 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3386} 3496}
3387 3497
3388sub pidfile() { 3498sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
… …
3438 }; 3548 };
3439 3549
3440 evthread_start IO::AIO::poll_fileno; 3550 evthread_start IO::AIO::poll_fileno;
3441 3551
3442 cf::sync_job { 3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3443 reload_resources; 3556 reload_resources;
3444 reload_config; 3557 reload_config;
3445 db_init; 3558 db_init;
3446 3559
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3560 cf::init_uuid;
3450 cf::init_signals; 3561 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3562 cf::init_skills;
3453 3563
3454 cf::init_beforeplay; 3564 cf::init_beforeplay;
3455 3565
3456 atomic; 3566 atomic;
… …
3481 }; 3591 };
3482 } 3592 }
3483} 3593}
3484 3594
3485sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = EV::time;
3597
3486 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3488 3600
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3602
3491 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3492 3604
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3606 or return;
3495 3607
3496 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3511 or return; 3623 or return;
3512 3624
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3626 and return;
3515 3627
3516 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3517 3629
3518 1 3630 1
3519} 3631}
3520 3632
3521our $uuid_lock; 3633our $uuid_lock;
… …
3740 3852
3741 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3742 3854
3743 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3744 require cf; 3856 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3746 3858
3747 warn "loading config and database again"; 3859 warn "loading config and database again";
3748 cf::reload_config; 3860 cf::reload_config;
3749 3861
3750 warn "loading extensions"; 3862 warn "loading extensions";
… …
3812 3924
3813our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3815 3927
3816sub wait_for_tick { 3928sub wait_for_tick {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 3930
3819 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 3933 $signal->wait;
3822} 3934}
3823 3935
3824sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 3938
3827 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 3941 $signal->wait;
3830} 3942}
… …
3835 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3836 return; 3948 return;
3837 } 3949 }
3838 3950
3839 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#
3840 3954
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $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.;
3843 Coro::async_pool { 3957 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
… …
3867} 3981}
3868 3982
3869{ 3983{
3870 # configure BDB 3984 # configure BDB
3871 3985
3872 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3875 3989
3876 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
… …
3958 } 4072 }
3959} 4073}
3960 4074
3961# load additional modules 4075# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3963 4078
3964END { cf::emergency_save } 4079END { cf::emergency_save }
3965 4080
39661 40811
3967 4082

Diff Legend

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