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.574 by root, Sun May 8 21:51:27 2011 UTC vs.
Revision 1.599 by root, Sun Nov 11 04:29:11 2012 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,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
58use IO::AIO (); 62use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 63use Compress::LZF;
61use Digest::MD5 (); 64use Digest::MD5 ();
62 65
63AnyEvent::detect; 66AnyEvent::detect;
64 67
… …
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
… …
108our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 117
113our %RESOURCE; # unused 118#our %RESOURCE; # unused
114 119
115our $OUTPUT_RATE_MIN = 3000; 120our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 121our $OUTPUT_RATE_MAX = 1000000;
117 122
118our $MAX_LINKS = 32; # how many chained exits to follow 123our $MAX_LINKS = 32; # how many chained exits to follow
… …
129our $DB_ENV; 134our $DB_ENV;
130 135
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 137
133our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 140
135our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
136our $RUNTIME = 0; 142our $RUNTIME = 0;
137our $SERVER_TICK = 0; 143our $SERVER_TICK = 0;
138our $NOW; 144our $NOW;
… …
219=item $cf::RUNTIME 225=item $cf::RUNTIME
220 226
221The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
222every server tick. 228every server tick.
223 229
224=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
225$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
226$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
227 233
228Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
229directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
230unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
231database environment. 237database environment.
… …
245Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
246from wherever your confdir points to. 252from wherever your confdir points to.
247 253
248=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
249 255
250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
251returns directly I<after> the tick processing (and consequently, can only wake one thread 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
252per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
253 260
254Note that cf::Wait_for_tick will immediately return when the server is not 261Note that cf::wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run 262ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really> 263when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
258 265
259=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
335)) { 342)) {
336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
337} 344}
338 345
339$EV::DIED = sub { 346$EV::DIED = sub {
340 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
341}; 348};
342 349
343############################################################################# 350#############################################################################
344 351
345sub fork_call(&@); 352sub fork_call(&@);
… …
372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
373 $d 380 $d
374 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
375} 382}
376 383
377=item $scalar = load_file $path 384=item $scalar = cf::load_file $path
378 385
379Loads the given file from path and returns its contents. Croaks on error 386Loads the given file from path and returns its contents. Croaks on error
380and can block. 387and can block.
381 388
382=cut 389=cut
… …
384sub load_file($) { 391sub load_file($) {
385 0 <= aio_load $_[0], my $data 392 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!"; 393 or Carp::croak "$_[0]: $!";
387 394
388 $data 395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
389} 434}
390 435
391=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
392 437
393Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
… …
856 901
857 return db_get cache => "$id/data"; 902 return db_get cache => "$id/data";
858 } 903 }
859 } 904 }
860 905
861 my $t1 = Time::HiRes::time; 906 my $t1 = EV::time;
862 my $data = $process->(\@data); 907 my $data = $process->(\@data);
863 my $t2 = Time::HiRes::time; 908 my $t2 = EV::time;
864 909
865 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
866 911
867 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
868 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
… …
1388=cut 1433=cut
1389 1434
1390############################################################################# 1435#############################################################################
1391# command handling &c 1436# command handling &c
1392 1437
1393=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1394 1439
1395Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1396$name. 1441$name.
1397 1442
1398=cut 1443=cut
… …
1404 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1405 1450
1406 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1407} 1452}
1408 1453
1409=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1410 1455
1411Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1412extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1413received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1414the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1415has logged in successfully. 1460has logged in successfully.
1416 1461
1417If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1418called.
1419 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1420=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1421 1470
1422Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1423exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd packet. Exti commands are processed by the server as soon as they
1424are received, i.e. out of order w.r.t. other commands. The first argument 1473are received, i.e. out of order w.r.t. other commands. The first argument
1425is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1426log-in. 1475log-in.
1427 1476
1428If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1429called.
1430 1478
1431=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1432 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1433sub register_extcmd { 1486sub register_extcmd($$) {
1434 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1435 1488
1436 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1437} 1490}
1438 1491
1439sub register_exticmd { 1492sub register_async_extcmd($$) {
1440 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1441 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1442 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1502}
1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1443} 1508}
1444 1509
1445use File::Glob (); 1510use File::Glob ();
1446 1511
1447cf::player->attach ( 1512cf::player->attach (
… …
1461 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1462 1527
1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1464 1529
1465 if (ref $msg) { 1530 if (ref $msg) {
1466 my ($type, $reply, @payload) = 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467 "ARRAY" eq ref $msg
1468 ? @$msg
1469 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1470 1532
1471 my @reply;
1472
1473 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1474 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1475 } 1551 }
1476
1477 $pl->ext_reply ($reply, @reply)
1478 if $reply;
1479 1552
1480 } else { 1553 } else {
1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1482 } 1555 }
1483 1556
… …
1496 }; 1569 };
1497 1570
1498 $grp 1571 $grp
1499} 1572}
1500 1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1501sub load_extensions { 1585sub load_extensions {
1502 info "loading extensions..."; 1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1503 1589
1504 cf::sync_job { 1590 cf::sync_job {
1505 my %todo; 1591 my %todo;
1506 1592
1507 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
… …
1550 unless exists $done{$_}; 1636 unless exists $done{$_};
1551 } 1637 }
1552 1638
1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1554 1640
1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1555 my $active = eval $v->{source}; 1650 my $active = eval $source;
1556 1651
1557 if (length $@) { 1652 if (length $@) {
1558 error "$v->{path}: $@\n"; 1653 error "$v->{path}: $@\n";
1559 1654
1560 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1847} 1942}
1848 1943
1849=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1850 1945
1851Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1852
1853=item $player->ext_reply ($msgid, @msg)
1854
1855Sends an ext reply to the player.
1856
1857=cut
1858
1859sub ext_reply($$@) {
1860 my ($self, $id, @msg) = @_;
1861
1862 $self->ns->ext_reply ($id, @msg)
1863}
1864 1947
1865=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1866 1949
1867Sends an ext event to the client. 1950Sends an ext event to the client.
1868 1951
… …
3173=cut 3256=cut
3174 3257
3175sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
3176 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
3177 3260
3178 if ($self->extcmd == 2) {
3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3180 } elsif ($self->extcmd == 1) { # TODO: remove
3181 push @msg, msgtype => "event_$type";
3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3183 }
3184}
3185
3186=item $client->ext_reply ($msgid, @msg)
3187
3188Sends an ext reply to the client.
3189
3190=cut
3191
3192sub cf::client::ext_reply($$@) {
3193 my ($self, $id, @msg) = @_;
3194
3195 if ($self->extcmd == 2) {
3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3197 } elsif ($self->extcmd == 1) {
3198 #TODO: version 1, remove
3199 unshift @msg, msgtype => "reply", msgid => $id;
3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3201 }
3202} 3262}
3203 3263
3204=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
3205 3265
3206Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
… …
3261 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
3262 3322
3263 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3264 3324
3265 if (ref $msg) { 3325 if (ref $msg) {
3266 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3267 "ARRAY" eq ref $msg
3268 ? @$msg
3269 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3270 3327
3271 my @reply;
3272
3273 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
3274 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3275 } 3346 }
3276
3277 $ns->ext_reply ($reply, @reply)
3278 if $reply;
3279
3280 } else { 3347 } else {
3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3282 } 3349 }
3283 3350
3284 cf::override; 3351 cf::override;
… …
3452=cut 3519=cut
3453 3520
3454############################################################################# 3521#############################################################################
3455# the server's init and main functions 3522# the server's init and main functions
3456 3523
3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525our @FACEDATA; # dynamically-created facedata
3526
3527# internal api, not fianlised
3528sub set_face {
3529 my ($name, $type, $data) = @_;
3530
3531 my $idx = cf::face::find $name;
3532
3533 if ($idx) {
3534 delete $FACEHASH{cf::face::get_chksum $idx};
3535 } else {
3536 $idx = cf::face::alloc $name;
3537 }
3538
3539 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3540
3541 cf::face::set_type $idx, $type;
3542 cf::face::set_data $idx, 0, (length $data), 0, $hash;
3543 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3544
3545 # we need to destroy the SV itself, not just overwrite,
3546 # as a running ix might hold a reference to it.
3547 # delete achieves that.
3548 delete $FACEDATA[$idx];
3549 $FACEDATA[$idx] = $data;
3550 $FACEHASH{$hash} = $idx;#d#
3551
3552 $idx
3553}
3554
3555our $FACEDATA; # facedata filehandle
3556
3557sub _face_get_data($$$$) {
3558 my ($idx, $size, $fofs, $cb) = @_;
3559
3560 if (defined $FACEDATA[$idx]) {
3561 $cb->($FACEDATA[$idx]);
3562 } elsif ($fofs) {
3563 my $buf;
3564 IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub {
3565 if ($_[0] == $size) {
3566 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3567 $cb->($buf);
3568 } else {
3569 cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request.";
3570 }
3571 };
3572 } else {
3573 cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring.";
3574 }
3575}
3576
3577# rather ineffient
3578sub cf::face::get_data($;$) {
3579 my ($idx, $faceset) = @_;
3580
3581 my $size = cf::face::get_size $idx, $faceset;
3582 my $fofs = cf::face::get_fofs $idx, $faceset;
3583
3584 _face_get_data $idx, $size, $fofs, Coro::rouse_cb;
3585 Coro::rouse_wait
3586}
3587
3588sub cf::face::ix {
3589 my ($ns, $idx, $pri, $size, $fofs) = @_;
3590
3591 _face_get_data $idx, $size, $fofs, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594}
3595
3457sub load_facedata($) { 3596sub load_facedata($) {
3458 my ($path) = @_; 3597 my ($path) = @_;
3459 3598
3460 # HACK to clear player env face cache, we need some signal framework
3461 # for this (global event?)
3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3463
3464 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3599 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3465 3600
3466 trace "loading facedata from $path\n"; 3601 trace "loading facedata from $path\n";
3467 3602
3468 my $facedata = decode_storable load_file $path; 3603 my $facedata = decode_storable load_file "$path/faceinfo";
3469 3604
3470 $facedata->{version} == 2 3605 $facedata->{version} == 2
3471 or cf::cleanup "$path: version mismatch, cannot proceed."; 3606 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3472 3607
3473 # patch in the exptable 3608 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3609 or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3475 $facedata->{resource}{"res/exp_table"} = { 3610
3476 type => FT_RSRC, 3611 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3477 data => $exp_table, 3612
3478 hash => (Digest::MD5::md5 $exp_table), 3613 # BEGIN ATOMIC
3479 }; 3614 # from here on, everything must be atomic - no thread switch allowed
3480 cf::cede_to_tick; 3615 my $t1 = EV::time;
3481 3616
3482 { 3617 {
3483 my $faces = $facedata->{faceinfo}; 3618 my $faces = $facedata->{faceinfo};
3484 3619
3485 while (my ($face, $info) = each %$faces) { 3620 for my $face (sort keys %$faces) {
3621 my $info = $faces->{$face};
3486 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3622 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3487 3623
3488 cf::face::set_visibility $idx, $info->{visibility}; 3624 cf::face::set_visibility $idx, $info->{visibility};
3489 cf::face::set_magicmap $idx, $info->{magicmap}; 3625 cf::face::set_magicmap $idx, $info->{magicmap};
3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3626 cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3627 cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3628 #cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3493 3629 $FACEHASH{$info->{hash64}} = $idx;#d#
3494 cf::cede_to_tick;
3495 } 3630 }
3496 3631
3497 while (my ($face, $info) = each %$faces) { 3632 while (my ($face, $info) = each %$faces) {
3498 next unless $info->{smooth}; 3633 next unless $info->{smooth};
3499 3634
… …
3504 cf::face::set_smooth $idx, $smooth; 3639 cf::face::set_smooth $idx, $smooth;
3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3640 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3506 } else { 3641 } else {
3507 error "smooth face '$info->{smooth}' not found for face '$face'"; 3642 error "smooth face '$info->{smooth}' not found for face '$face'";
3508 } 3643 }
3509
3510 cf::cede_to_tick;
3511 } 3644 }
3512 } 3645 }
3513 3646
3514 { 3647 {
3515 my $anims = $facedata->{animinfo}; 3648 my $anims = $facedata->{animinfo};
3516 3649
3517 while (my ($anim, $info) = each %$anims) { 3650 while (my ($anim, $info) = each %$anims) {
3518 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3651 cf::anim::set $anim, $info->{frames}, $info->{facings};
3519 cf::cede_to_tick;
3520 } 3652 }
3521 3653
3522 cf::anim::invalidate_all; # d'oh 3654 cf::anim::invalidate_all; # d'oh
3523 } 3655 }
3524 3656
3525 { 3657 {
3526 my $res = $facedata->{resource}; 3658 my $res = $facedata->{resource};
3527 3659
3528 while (my ($name, $info) = each %$res) { 3660 while (my ($name, $info) = each %$res) {
3529 if (defined $info->{type}) { 3661 if (defined (my $type = $info->{type})) {
3662 # TODO: different hash - must free and use new index, or cache ixface data queue
3530 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3663 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3531 3664
3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3533 cf::face::set_type $idx, $info->{type}; 3665 cf::face::set_type $idx, $type;
3666 cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash};
3667 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3668 $FACEHASH{$info->{hash}} = $idx;#d#
3534 } else { 3669 } else {
3535 $RESOURCE{$name} = $info; # unused 3670# $RESOURCE{$name} = $info; # unused
3536 } 3671 }
3537
3538 cf::cede_to_tick;
3539 } 3672 }
3540 } 3673 }
3674
3675 ($fh, $FACEDATA) = ($FACEDATA, $fh);
3676
3677 # HACK to clear player env face cache, we need some signal framework
3678 # for this (global event?)
3679 %ext::player_env::MUSIC_FACE_CACHE = ();
3680
3681 # END ATOMIC
3682
3683 cf::debug "facedata atomic update time ", EV::time - $t1;
3541 3684
3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3685 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3686
3687 aio_close $fh if $fh; # close old facedata
3543 3688
3544 1 3689 1
3545} 3690}
3546 3691
3547register_exticmd fx_want => sub { 3692register_exticmd fx_want => sub {
… …
3558 my $status = load_resource_file_ $_[0]; 3703 my $status = load_resource_file_ $_[0];
3559 get_slot 0.1, 100; 3704 get_slot 0.1, 100;
3560 cf::arch::commit_load; 3705 cf::arch::commit_load;
3561 3706
3562 $status 3707 $status
3708}
3709
3710sub reload_exp_table {
3711 _reload_exp_table;
3712
3713 set_face "res/exp_table" => FT_RSRC,
3714 JSON::XS->new->utf8->canonical->encode (
3715 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3716 );
3717}
3718
3719sub reload_materials {
3720 _reload_materials;
3563} 3721}
3564 3722
3565sub reload_regions { 3723sub reload_regions {
3566 # HACK to clear player env face cache, we need some signal framework 3724 # HACK to clear player env face cache, we need some signal framework
3567 # for this (global event?) 3725 # for this (global event?)
… …
3575 if exists $_->{match}; 3733 if exists $_->{match};
3576 } 3734 }
3577} 3735}
3578 3736
3579sub reload_facedata { 3737sub reload_facedata {
3580 load_facedata "$DATADIR/facedata" 3738 load_facedata $DATADIR
3581 or die "unable to load facedata\n"; 3739 or die "unable to load facedata\n";
3582} 3740}
3583 3741
3584sub reload_archetypes { 3742sub reload_archetypes {
3585 load_resource_file "$DATADIR/archetypes" 3743 load_resource_file "$DATADIR/archetypes"
3586 or die "unable to load archetypes\n"; 3744 or die "unable to load archetypes\n";
3745
3746 set_face "res/skill_info" => FT_RSRC,
3747 JSON::XS->new->utf8->canonical->encode (
3748 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3749 );
3750 set_face "res/spell_paths" => FT_RSRC,
3751 JSON::XS->new->utf8->canonical->encode (
3752 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3753 );
3587} 3754}
3588 3755
3589sub reload_treasures { 3756sub reload_treasures {
3590 load_resource_file "$DATADIR/treasures" 3757 load_resource_file "$DATADIR/treasures"
3591 or die "unable to load treasurelists\n"; 3758 or die "unable to load treasurelists\n";
… …
3612} 3779}
3613 3780
3614sub reload_resources { 3781sub reload_resources {
3615 trace "reloading resource files...\n"; 3782 trace "reloading resource files...\n";
3616 3783
3617 reload_exp_table;
3618 reload_materials; 3784 reload_materials;
3619 reload_facedata; 3785 reload_facedata;
3786 reload_exp_table;
3620 reload_sound; 3787 reload_sound;
3621 reload_archetypes; 3788 reload_archetypes;
3622 reload_regions; 3789 reload_regions;
3623 reload_treasures; 3790 reload_treasures;
3624 3791
… …
3676 3843
3677sub main { 3844sub main {
3678 cf::init_globals; # initialise logging 3845 cf::init_globals; # initialise logging
3679 3846
3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3847 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3848 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3849 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3850 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3684 3851
3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3852 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3686 3853
3687 # we must not ever block the main coroutine 3854 # we must not ever block the main coroutine
3688 local $Coro::idle = sub { 3855 $Coro::idle = sub {
3689 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3856 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3690 (async { 3857 (async {
3691 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3858 $Coro::current->{desc} = "IDLE BUG HANDLER";
3692 EV::loop EV::LOOP_ONESHOT; 3859 EV::loop EV::LOOP_ONESHOT;
3693 })->prio (Coro::PRIO_MAX); 3860 })->prio (Coro::PRIO_MAX);
… …
3696 evthread_start IO::AIO::poll_fileno; 3863 evthread_start IO::AIO::poll_fileno;
3697 3864
3698 cf::sync_job { 3865 cf::sync_job {
3699 cf::incloader::init (); 3866 cf::incloader::init ();
3700 3867
3868 db_init;
3869
3701 cf::init_anim; 3870 cf::init_anim;
3702 cf::init_attackmess; 3871 cf::init_attackmess;
3703 cf::init_dynamic; 3872 cf::init_dynamic;
3704 3873
3705 cf::load_settings; 3874 cf::load_settings;
3706 3875
3707 reload_resources; 3876 reload_resources;
3708 reload_config; 3877 reload_config;
3709 db_init;
3710 3878
3711 cf::init_uuid; 3879 cf::init_uuid;
3712 cf::init_signals; 3880 cf::init_signals;
3713 cf::init_skills; 3881 cf::init_skills;
3714 3882
… …
3728 }; 3896 };
3729 3897
3730 cf::object::thawer::errors_are_fatal 0; 3898 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n"; 3899 info "parse errors in files are no longer fatal from this point on.\n";
3732 3900
3733 my $free_main; $free_main = EV::idle sub { 3901 AE::postpone {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :) 3902 undef &main; # free gobs of memory :)
3736 }; 3903 };
3737 3904
3738 goto &main_loop; 3905 goto &main_loop;
3739} 3906}
… …
3896 4063
3897 cf::write_runtime_sync; # external watchdog should not bark 4064 cf::write_runtime_sync; # external watchdog should not bark
3898 4065
3899 trace "emergency_perl_save: flushing outstanding aio requests"; 4066 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) { 4067 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4068 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3902 } 4069 }
3903 4070
3904 cf::write_runtime_sync; # external watchdog should not bark 4071 cf::write_runtime_sync; # external watchdog should not bark
3905 }; 4072 };
3906 4073
… …
4140 } 4307 }
4141} 4308}
4142 4309
4143{ 4310{
4144 # configure BDB 4311 # configure BDB
4312 info "initialising database";
4145 4313
4146 BDB::min_parallel 16; 4314 BDB::min_parallel 16;
4147 BDB::max_poll_reqs $TICK * 0.1; 4315 BDB::max_poll_reqs $TICK * 0.1;
4148 $AnyEvent::BDB::WATCHER->priority (1); 4316 #$AnyEvent::BDB::WATCHER->priority (1);
4149 4317
4150 unless ($DB_ENV) { 4318 unless ($DB_ENV) {
4151 $DB_ENV = BDB::db_env_create; 4319 $DB_ENV = BDB::db_env_create;
4152 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4320 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4153 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4321 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4178 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4346 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4179 }; 4347 };
4180 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4348 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4181 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4349 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4182 }; 4350 };
4351
4352 info "database initialised";
4183} 4353}
4184 4354
4185{ 4355{
4186 # configure IO::AIO 4356 # configure IO::AIO
4187 4357
4358 info "initialising aio";
4188 IO::AIO::min_parallel 8; 4359 IO::AIO::min_parallel 8;
4189 IO::AIO::max_poll_time $TICK * 0.1; 4360 IO::AIO::max_poll_time $TICK * 0.1;
4190 undef $AnyEvent::AIO::WATCHER; 4361 undef $AnyEvent::AIO::WATCHER;
4362 info "aio initialised";
4191} 4363}
4192 4364
4193our $_log_backtrace; 4365our $_log_backtrace;
4194our $_log_backtrace_last; 4366our $_log_backtrace_last;
4195 4367

Diff Legend

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