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.555 by root, Wed Jun 30 01:32:56 2010 UTC vs.
Revision 1.596 by root, Fri Nov 9 20:37:57 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 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 ();
… …
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
94our @REFLECT; # set by XS 100our @REFLECT; # set by XS
95our %REFLECT; # set by us 101our %REFLECT; # set by us
96 102
97our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
98our $DATADIR = datadir; 105our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
102our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 118
111our %RESOURCE; # unused 119#our %RESOURCE; # unused
112 120
113our $OUTPUT_RATE_MIN = 3000; 121our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 122our $OUTPUT_RATE_MAX = 1000000;
115 123
116our $MAX_LINKS = 32; # how many chained exits to follow 124our $MAX_LINKS = 32; # how many chained exits to follow
… …
127our $DB_ENV; 135our $DB_ENV;
128 136
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 138
131our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 141
133our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
135our $NOW; 145our $NOW;
136 146
137our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
… …
148 158
149our @POST_INIT; 159our @POST_INIT;
150 160
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
153 166
154binmode STDOUT; 167binmode STDOUT;
155binmode STDERR; 168binmode STDERR;
156 169
157# read virtual server time, if available 170# read virtual server time, if available
… …
191 204
192=over 4 205=over 4
193 206
194=item $cf::UPTIME 207=item $cf::UPTIME
195 208
196The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
197 225
198=item $cf::RUNTIME 226=item $cf::RUNTIME
199 227
200The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 229every server tick.
202 230
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 234
207Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
210database environment. 238database environment.
211 239
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 240=item $cf::LOADAVG
221 241
222The current CPU load on the server (alpha-smoothed), as a value between 0 242The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 243(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
… …
235=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
236 256
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one thread 258returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::Wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
240 272
241=cut 273=cut
242 274
243sub wait_for_tick(); 275sub wait_for_tick();
244sub wait_for_tick_begin(); 276sub wait_for_tick_begin();
… …
310)) { 342)) {
311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312} 344}
313 345
314$EV::DIED = sub { 346$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
316}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
317 354
318############################################################################# 355#############################################################################
319 356
320=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
321 358
… …
342 $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;
343 $d 380 $d
344 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
345} 382}
346 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
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
434}
435
347=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
348 437
349Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
350 439
351=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
… …
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 447
359sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
361 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
362=item $ref = cf::yaml_load $scalar 459=item $ref = cf::decode_yaml $scalar
363 460
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 462
366=cut 463=cut
367 464
368sub fork_call(&@); 465sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
372} 480}
373 481
374=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
375 483
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
460 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
461} 569}
462 570
463=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
464 572
465Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
466This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
467of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority les than zero, interactive jobs
579should use 100 or more.
468 580
469The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
470used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
471 583
472Useful for short background jobs. 584Useful for short background jobs.
… …
501 } 613 }
502 } 614 }
503 615
504 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
505 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
506 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
507 $signal->wait;
508 } else { 619 } else {
509 $busy = 0; 620 $busy = 0;
510 Coro::schedule; 621 Coro::schedule;
511 } 622 }
512 } 623 }
… …
767 878
768 my @data; 879 my @data;
769 my $md5; 880 my $md5;
770 881
771 for (0 .. $#$src) { 882 for (0 .. $#$src) {
772 0 <= aio_load $src->[$_], $data[$_] 883 $data[$_] = load_file $src->[$_];
773 or Carp::croak "$src->[$_]: $!";
774 } 884 }
775 885
776 # if processing is expensive, check 886 # if processing is expensive, check
777 # checksum first 887 # checksum first
778 if (1) { 888 if (1) {
… …
1323=cut 1433=cut
1324 1434
1325############################################################################# 1435#############################################################################
1326# command handling &c 1436# command handling &c
1327 1437
1328=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1329 1439
1330Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1331$name. 1441$name.
1332 1442
1333=cut 1443=cut
… …
1339 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1340 1450
1341 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1342} 1452}
1343 1453
1344=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1345 1455
1346Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1347extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1348received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1349the 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
1350has logged in successfully. 1460has logged in successfully.
1351 1461
1352If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1353called.
1354 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
1355=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1356 1470
1357Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1358exticmd 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
1359are 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
1360is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1361log-in. 1475log-in.
1362 1476
1363If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1364called.
1365 1478
1366=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1367 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
1368sub register_extcmd { 1486sub register_extcmd($$) {
1369 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1370 1488
1371 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1372} 1490}
1373 1491
1374sub register_exticmd { 1492sub register_async_extcmd($$) {
1375 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1376 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1377 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1502}
1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1378} 1508}
1379 1509
1380use File::Glob (); 1510use File::Glob ();
1381 1511
1382cf::player->attach ( 1512cf::player->attach (
… …
1396 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1397 1527
1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399 1529
1400 if (ref $msg) { 1530 if (ref $msg) {
1401 my ($type, $reply, @payload) = 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1402 "ARRAY" eq ref $msg
1403 ? @$msg
1404 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405 1532
1406 my @reply;
1407
1408 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}) {
1409 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1410 } 1551 }
1411
1412 $pl->ext_reply ($reply, @reply)
1413 if $reply;
1414 1552
1415 } else { 1553 } else {
1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1417 } 1555 }
1418 1556
… …
1431 }; 1569 };
1432 1570
1433 $grp 1571 $grp
1434} 1572}
1435 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
1436sub load_extensions { 1585sub load_extensions {
1437 info "loading extensions..."; 1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1438 1589
1439 cf::sync_job { 1590 cf::sync_job {
1440 my %todo; 1591 my %todo;
1441 1592
1442 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
… …
1485 unless exists $done{$_}; 1636 unless exists $done{$_};
1486 } 1637 }
1487 1638
1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489 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
1490 my $active = eval $v->{source}; 1650 my $active = eval $source;
1491 1651
1492 if (length $@) { 1652 if (length $@) {
1493 error "$v->{path}: $@\n"; 1653 error "$v->{path}: $@\n";
1494 1654
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1512 1672
1513 while (my ($k, $v) = each %todo) { 1673 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1674 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory}; 1675 if exists $v->{meta}{mandatory};
1516 } 1676 }
1677
1678 last;
1517 } 1679 }
1518 } 1680 }
1519 }; 1681 };
1520} 1682}
1521 1683
… …
1781 1943
1782=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1783 1945
1784Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1785 1947
1786=item $player->ext_reply ($msgid, @msg)
1787
1788Sends an ext reply to the player.
1789
1790=cut
1791
1792sub ext_reply($$@) {
1793 my ($self, $id, @msg) = @_;
1794
1795 $self->ns->ext_reply ($id, @msg)
1796}
1797
1798=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1799 1949
1800Sends an ext event to the client. 1950Sends an ext event to the client.
1801 1951
1802=cut 1952=cut
… …
1861sub generate_random_map { 2011sub generate_random_map {
1862 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1863 2013
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2014 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865 2015
1866 # mit "rum" bekleckern, nicht
1867 $self->_create_random_map ( 2016 $self->_create_random_map ($rmp);
1868 $rmp, $rmp->{total_map_hp},
1869 (cf::region::find $rmp->{region})
1870 )
1871} 2017}
1872 2018
1873=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1874 2020
1875Register a handler for the map path matching the given regex at the 2021Register a handler for the map path matching the given regex at the
… …
1953 2099
1954 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1955 () 2101 ()
1956} 2102}
1957 2103
2104# may re-bless or do other evil things
1958sub init { 2105sub init {
1959 my ($self) = @_; 2106 my ($self) = @_;
1960 2107
1961 $self 2108 $self
1962} 2109}
… …
2027 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
2028 2175
2029 1 2176 1
2030} 2177}
2031 2178
2179# used to laod the header of an original map
2032sub load_header_orig { 2180sub load_header_orig {
2033 my ($self) = @_; 2181 my ($self) = @_;
2034 2182
2035 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
2036} 2184}
2037 2185
2186# used to laod the header of an instantiated map
2038sub load_header_temp { 2187sub load_header_temp {
2039 my ($self) = @_; 2188 my ($self) = @_;
2040 2189
2041 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
2042} 2191}
2043 2192
2193# called after loading the header from an instantiated map
2044sub prepare_temp { 2194sub prepare_temp {
2045 my ($self) = @_; 2195 my ($self) = @_;
2046 2196
2047 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
2048 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
2049 # safety 2199 # safety
2050 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
2051 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
2052} 2202}
2053 2203
2204# called after loading the header from an original map
2054sub prepare_orig { 2205sub prepare_orig {
2055 my ($self) = @_; 2206 my ($self) = @_;
2056 2207
2057 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
2058 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
… …
2084sub find { 2235sub find {
2085 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2086 2237
2087 cf::cede_to_tick; 2238 cf::cede_to_tick;
2088 2239
2089 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
2090 2241
2091 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2092 my $guard2 = cf::lock_acquire "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
2093 2244
2094 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
… …
2125 2276
2126 { 2277 {
2127 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
2128 2279
2129 return unless $self->valid; 2280 return unless $self->valid;
2130 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
2131
2132 $self->in_memory (cf::MAP_LOADING);
2133 2282
2134 $self->alloc; 2283 $self->alloc;
2135 2284
2136 $self->pre_load; 2285 $self->pre_load;
2137 cf::cede_to_tick; 2286 cf::cede_to_tick;
2138 2287
2288 if (exists $self->{load_path}) {
2139 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2140 $f->skip_block; 2290 $f->skip_block;
2141 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2142 or return; 2292 or return;
2143 2293
2144 $self->post_load_original 2294 $self->post_load_original
2145 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2146 2296
2147 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2148 utf8::encode $uniq; 2298 utf8::encode $uniq;
2149 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2150 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2151 $self->clear_unique_items; 2301 $self->clear_unique_items;
2152 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2153 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2154 } 2305 }
2155 } 2306 }
2156 }
2157 2307
2158 $f->resolve_delayed_derefs; 2308 $f->resolve_delayed_derefs;
2309 } else {
2310 $self->post_load_original
2311 if delete $self->{load_original};
2312 }
2313
2314 $self->state (cf::MAP_INACTIVE);
2159 2315
2160 cf::cede_to_tick; 2316 cf::cede_to_tick;
2161 # now do the right thing for maps 2317 # now do the right thing for maps
2162 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2163 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
… …
2167 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2168 $self->decay_objects; 2324 $self->decay_objects;
2169 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2170 $self->update_buttons; 2326 $self->update_buttons;
2171 cf::cede_to_tick; 2327 cf::cede_to_tick;
2172 $self->activate; 2328 #$self->activate; # no longer activate maps automatically
2173 } 2329 }
2174 2330
2175 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2176 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2177
2178 $self->in_memory (cf::MAP_ACTIVE);
2179 } 2333 }
2180 2334
2181 $self->post_load; 2335 $self->post_load;
2182 2336
2183 1 2337 1
… …
2196# if $self->per_party; 2350# if $self->per_party;
2197 2351
2198 $self 2352 $self
2199} 2353}
2200 2354
2201# find and load all maps in the 3x3 area around a map
2202sub load_neighbours {
2203 my ($map) = @_;
2204
2205 my @neigh; # diagonal neighbours
2206
2207 for (0 .. 3) {
2208 my $neigh = $map->tile_path ($_)
2209 or next;
2210 $neigh = find $neigh, $map
2211 or next;
2212 $neigh->load;
2213
2214 # now find the diagonal neighbours
2215 push @neigh,
2216 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2217 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2218 }
2219
2220 for (grep defined $_->[0], @neigh) {
2221 my ($path, $origin) = @$_;
2222 my $neigh = find $path, $origin
2223 or next;
2224 $neigh->load;
2225 }
2226}
2227
2228sub find_sync { 2355sub find_sync {
2229 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2230 2357
2358 # it's a bug to call this from the main context
2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2232 if $Coro::current == $Coro::main; 2360 if $Coro::current == $Coro::main;
2233 2361
2234 find $path, $origin 2362 find $path, $origin
2235} 2363}
2236 2364
2237sub do_load_sync { 2365sub do_load_sync {
2238 my ($map) = @_; 2366 my ($map) = @_;
2239 2367
2368 # it's a bug to call this from the main context
2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2241 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2242 2371
2243 $map->load; 2372 $map->load;
2244} 2373}
… …
2247our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2248 2377
2249sub find_async { 2378sub find_async {
2250 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2251 2380
2252 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2253 2382
2254 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2255 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2256 } 2385 }
2257 2386
2258 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2259 2388
2260 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
… …
2319sub swap_out { 2448sub swap_out {
2320 my ($self) = @_; 2449 my ($self) = @_;
2321 2450
2322 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323 2452
2324 return if $self->in_memory != cf::MAP_ACTIVE; 2453 return if !$self->linkable;
2325 return if $self->{deny_save}; 2454 return if $self->{deny_save};
2326 return if $self->players; 2455 return if $self->players;
2327 2456
2328 # first deactivate the map and "unlink" it from the core 2457 # first deactivate the map and "unlink" it from the core
2329 $self->deactivate; 2458 $self->deactivate;
2330 $_->clear_links_to ($self) for values %cf::MAP; 2459 $_->clear_links_to ($self) for values %cf::MAP;
2331 $self->in_memory (cf::MAP_SWAPPED); 2460 $self->state (cf::MAP_SWAPPED);
2332 2461
2333 # then atomically save 2462 # then atomically save
2334 $self->_save; 2463 $self->_save;
2335 2464
2336 # then free the map 2465 # then free the map
… …
2362 2491
2363 return if $self->players; 2492 return if $self->players;
2364 2493
2365 cf::trace "resetting map ", $self->path, "\n"; 2494 cf::trace "resetting map ", $self->path, "\n";
2366 2495
2367 $self->in_memory (cf::MAP_SWAPPED); 2496 $self->state (cf::MAP_SWAPPED);
2368 2497
2369 # need to save uniques path 2498 # need to save uniques path
2370 unless ($self->{deny_save}) { 2499 unless ($self->{deny_save}) {
2371 my $uniq = $self->uniq_path; utf8::encode $uniq; 2500 my $uniq = $self->uniq_path; utf8::encode $uniq;
2372 2501
… …
2702 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2703 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2704 if $x <= 0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2705 2834
2706 $map->load; 2835 $map->load;
2707 $map->load_neighbours;
2708 2836
2709 return unless $self->contr->active; 2837 return unless $self->contr->active;
2710 2838
2711 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2712 if ($self->enter_map ($map, $x, $y)) { 2840 if ($self->enter_map ($map, $x, $y)) {
… …
2768 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2769 } 2897 }
2770 } 2898 }
2771 2899
2772 my $map = eval { 2900 my $map = eval {
2773 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2774 2902
2775 if ($map) { 2903 if ($map) {
2776 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2777 $map = $check->($map, $x, $y, $self) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2778 } else { 2906 } else {
… …
2868 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2869 2997
2870 unless (eval { 2998 unless (eval {
2871 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2872 3000
2873 # random map handling
2874 {
2875 my $guard = cf::lock_acquire "exit_prepare:$exit";
2876
2877 prepare_random_map $exit
2878 if $exit->slaying eq "/!";
2879 }
2880
2881 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2882 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2883 my $y = $exit->stats->sp; 3003 my $y = $exit->stats->sp;
3004
3005 # special map handling
3006 my $slaying = $exit->slaying;
3007
3008 # special map handling
3009 if ($slaying eq "/!") {
3010 my $guard = cf::lock_acquire "exit_prepare:$exit";
3011
3012 prepare_random_map $exit
3013 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3014
3015 $map = $exit->slaying;
3016
3017 } elsif ($slaying eq '!up') {
3018 $map = $exit->map->tile_path (cf::TILE_UP);
3019 $x = $exit->x;
3020 $y = $exit->y;
3021
3022 } elsif ($slaying eq '!down') {
3023 $map = $exit->map->tile_path (cf::TILE_DOWN);
3024 $x = $exit->x;
3025 $y = $exit->y;
3026 }
2884 3027
2885 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2886 3029
2887 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2888 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
… …
3113=cut 3256=cut
3114 3257
3115sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
3116 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
3117 3260
3118 if ($self->extcmd == 2) {
3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3120 } elsif ($self->extcmd == 1) { # TODO: remove
3121 push @msg, msgtype => "event_$type";
3122 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3123 }
3124}
3125
3126=item $client->ext_reply ($msgid, @msg)
3127
3128Sends an ext reply to the client.
3129
3130=cut
3131
3132sub cf::client::ext_reply($$@) {
3133 my ($self, $id, @msg) = @_;
3134
3135 if ($self->extcmd == 2) {
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3137 } elsif ($self->extcmd == 1) {
3138 #TODO: version 1, remove
3139 unshift @msg, msgtype => "reply", msgid => $id;
3140 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3141 }
3142} 3262}
3143 3263
3144=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
3145 3265
3146Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
… …
3201 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
3202 3322
3203 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3204 3324
3205 if (ref $msg) { 3325 if (ref $msg) {
3206 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3207 "ARRAY" eq ref $msg
3208 ? @$msg
3209 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3210 3327
3211 my @reply;
3212
3213 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}) {
3214 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3215 } 3346 }
3216
3217 $ns->ext_reply ($reply, @reply)
3218 if $reply;
3219
3220 } else { 3347 } else {
3221 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";
3222 } 3349 }
3223 3350
3224 cf::override; 3351 cf::override;
… …
3392=cut 3519=cut
3393 3520
3394############################################################################# 3521#############################################################################
3395# the server's init and main functions 3522# the server's init and main functions
3396 3523
3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525
3526# internal api, not fianlised
3527sub set_face {
3528 my ($name, $type, $data) = @_;
3529
3530 my $idx = cf::face::find $name;
3531
3532 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx};
3534 } else {
3535 $idx = cf::face::alloc $name;
3536 }
3537
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3539
3540 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash;
3542 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3543 $FACEHASH{$hash} = $idx;#d#
3544
3545 $idx
3546}
3547
3397sub load_facedata($) { 3548sub load_facedata($) {
3398 my ($path) = @_; 3549 my ($path) = @_;
3399 3550
3400 # HACK to clear player env face cache, we need some signal framework 3551 # HACK to clear player env face cache, we need some signal framework
3401 # for this (global event?) 3552 # for this (global event?)
… …
3403 3554
3404 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3555 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3405 3556
3406 trace "loading facedata from $path\n"; 3557 trace "loading facedata from $path\n";
3407 3558
3408 0 < aio_load $path, my $facedata 3559 my $facedata = decode_storable load_file $path;
3409 or die "$path: $!";
3410
3411 $facedata = Coro::Storable::thaw $facedata;
3412 3560
3413 $facedata->{version} == 2 3561 $facedata->{version} == 2
3414 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3415 3563
3416 # patch in the exptable
3417 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3418 $facedata->{resource}{"res/exp_table"} = {
3419 type => FT_RSRC,
3420 data => $exp_table,
3421 hash => (Digest::MD5::md5 $exp_table),
3422 };
3423 cf::cede_to_tick; 3564 cf::cede_to_tick;
3424 3565
3425 { 3566 {
3426 my $faces = $facedata->{faceinfo}; 3567 my $faces = $facedata->{faceinfo};
3427 3568
3428 while (my ($face, $info) = each %$faces) { 3569 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face};
3429 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3430 3572
3431 cf::face::set_visibility $idx, $info->{visibility}; 3573 cf::face::set_visibility $idx, $info->{visibility};
3432 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3433 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3434 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3435 3579
3436 cf::cede_to_tick; 3580 cf::cede_to_tick;
3437 } 3581 }
3438 3582
3439 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
… …
3466 3610
3467 { 3611 {
3468 my $res = $facedata->{resource}; 3612 my $res = $facedata->{resource};
3469 3613
3470 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3471 if (defined $info->{type}) { 3615 if (defined (my $type = $info->{type})) {
3616 # TODO: different hash - must free and use new index, or cache ixface data queue
3472 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3473 3618
3619 cf::face::set_type $idx, $type;
3474 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3620 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3475 cf::face::set_type $idx, $info->{type}; 3621 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3622 $FACEHASH{$info->{hash}} = $idx;#d#
3476 } else { 3623 } else {
3477 $RESOURCE{$name} = $info; # unused 3624# $RESOURCE{$name} = $info; # unused
3478 } 3625 }
3479 3626
3480 cf::cede_to_tick; 3627 cf::cede_to_tick;
3481 } 3628 }
3482 } 3629 }
… …
3500 my $status = load_resource_file_ $_[0]; 3647 my $status = load_resource_file_ $_[0];
3501 get_slot 0.1, 100; 3648 get_slot 0.1, 100;
3502 cf::arch::commit_load; 3649 cf::arch::commit_load;
3503 3650
3504 $status 3651 $status
3652}
3653
3654sub reload_exp_table {
3655 _reload_exp_table;
3656
3657 set_face "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 );
3661}
3662
3663sub reload_materials {
3664 _reload_materials;
3505} 3665}
3506 3666
3507sub reload_regions { 3667sub reload_regions {
3508 # HACK to clear player env face cache, we need some signal framework 3668 # HACK to clear player env face cache, we need some signal framework
3509 # for this (global event?) 3669 # for this (global event?)
… …
3524} 3684}
3525 3685
3526sub reload_archetypes { 3686sub reload_archetypes {
3527 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3528 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3689
3690 set_face "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 );
3694 set_face "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 );
3529} 3698}
3530 3699
3531sub reload_treasures { 3700sub reload_treasures {
3532 load_resource_file "$DATADIR/treasures" 3701 load_resource_file "$DATADIR/treasures"
3533 or die "unable to load treasurelists\n"; 3702 or die "unable to load treasurelists\n";
3534} 3703}
3535 3704
3536sub reload_sound { 3705sub reload_sound {
3537 trace "loading sound config from $DATADIR/sound\n"; 3706 trace "loading sound config from $DATADIR/sound\n";
3538 3707
3539 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3540 or die "$DATADIR/sound $!";
3541
3542 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3708 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3543 3709
3544 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3710 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3545 my $sound = $soundconf->{compat}[$_] 3711 my $sound = $soundconf->{compat}[$_]
3546 or next; 3712 or next;
3547 3713
… …
3557} 3723}
3558 3724
3559sub reload_resources { 3725sub reload_resources {
3560 trace "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3561 3727
3562 reload_exp_table;
3563 reload_materials; 3728 reload_materials;
3564 reload_facedata; 3729 reload_facedata;
3730 reload_exp_table;
3565 reload_sound; 3731 reload_sound;
3566 reload_archetypes; 3732 reload_archetypes;
3567 reload_regions; 3733 reload_regions;
3568 reload_treasures; 3734 reload_treasures;
3569 3735
… …
3571} 3737}
3572 3738
3573sub reload_config { 3739sub reload_config {
3574 trace "reloading config file...\n"; 3740 trace "reloading config file...\n";
3575 3741
3576 0 < aio_load "$CONFDIR/config", my $config 3742 my $config = load_file "$CONFDIR/config";
3577 or die "$CONFDIR/config: $!";
3578
3579 utf8::decode $config; 3743 utf8::decode $config;
3580 *CFG = yaml_load $config; 3744 *CFG = decode_yaml $config;
3581 3745
3582 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3583 3747
3584 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3585 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3623 3787
3624sub main { 3788sub main {
3625 cf::init_globals; # initialise logging 3789 cf::init_globals; # initialise logging
3626 3790
3627 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3791 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3628 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3792 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3629 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3793 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3630 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3794 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3631 3795
3632 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3796 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3633 3797
3634 # we must not ever block the main coroutine 3798 # we must not ever block the main coroutine
3635 local $Coro::idle = sub { 3799 $Coro::idle = sub {
3636 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3800 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3637 (async { 3801 (async {
3638 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3802 $Coro::current->{desc} = "IDLE BUG HANDLER";
3639 EV::loop EV::LOOP_ONESHOT; 3803 EV::loop EV::LOOP_ONESHOT;
3640 })->prio (Coro::PRIO_MAX); 3804 })->prio (Coro::PRIO_MAX);
… …
3643 evthread_start IO::AIO::poll_fileno; 3807 evthread_start IO::AIO::poll_fileno;
3644 3808
3645 cf::sync_job { 3809 cf::sync_job {
3646 cf::incloader::init (); 3810 cf::incloader::init ();
3647 3811
3812 db_init;
3813
3648 cf::init_anim; 3814 cf::init_anim;
3649 cf::init_attackmess; 3815 cf::init_attackmess;
3650 cf::init_dynamic; 3816 cf::init_dynamic;
3651 3817
3652 cf::load_settings; 3818 cf::load_settings;
3653 3819
3654 reload_resources; 3820 reload_resources;
3655 reload_config; 3821 reload_config;
3656 db_init;
3657 3822
3658 cf::init_uuid; 3823 cf::init_uuid;
3659 cf::init_signals; 3824 cf::init_signals;
3660 cf::init_skills; 3825 cf::init_skills;
3661 3826
… …
3675 }; 3840 };
3676 3841
3677 cf::object::thawer::errors_are_fatal 0; 3842 cf::object::thawer::errors_are_fatal 0;
3678 info "parse errors in files are no longer fatal from this point on.\n"; 3843 info "parse errors in files are no longer fatal from this point on.\n";
3679 3844
3680 my $free_main; $free_main = EV::idle sub { 3845 AE::postpone {
3681 undef $free_main;
3682 undef &main; # free gobs of memory :) 3846 undef &main; # free gobs of memory :)
3683 }; 3847 };
3684 3848
3685 goto &main_loop; 3849 goto &main_loop;
3686} 3850}
… …
3843 4007
3844 cf::write_runtime_sync; # external watchdog should not bark 4008 cf::write_runtime_sync; # external watchdog should not bark
3845 4009
3846 trace "emergency_perl_save: flushing outstanding aio requests"; 4010 trace "emergency_perl_save: flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) { 4011 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4012 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3849 } 4013 }
3850 4014
3851 cf::write_runtime_sync; # external watchdog should not bark 4015 cf::write_runtime_sync; # external watchdog should not bark
3852 }; 4016 };
3853 4017
… …
4034 4198
4035############################################################################# 4199#############################################################################
4036 4200
4037my $bug_warning = 0; 4201my $bug_warning = 0;
4038 4202
4039our @WAIT_FOR_TICK;
4040our @WAIT_FOR_TICK_BEGIN;
4041
4042sub wait_for_tick() { 4203sub wait_for_tick() {
4043 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4204 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4044 4205
4045 my $signal = new Coro::Signal; 4206 $WAIT_FOR_TICK->wait;
4046 push @WAIT_FOR_TICK, $signal;
4047 $signal->wait;
4048} 4207}
4049 4208
4050sub wait_for_tick_begin() { 4209sub wait_for_tick_begin() {
4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4210 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4052 4211
4053 my $signal = new Coro::Signal; 4212 my $signal = new Coro::Signal;
4054 push @WAIT_FOR_TICK_BEGIN, $signal; 4213 push @WAIT_FOR_TICK_BEGIN, $signal;
4055 $signal->wait; 4214 $signal->wait;
4056} 4215}
… …
4060 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4219 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4061 unless ++$bug_warning > 10; 4220 unless ++$bug_warning > 10;
4062 return; 4221 return;
4063 } 4222 }
4064 4223
4065 cf::server_tick; # one server iteration 4224 cf::one_tick; # one server iteration
4066 4225
4067 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4226 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4068 4227
4069 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4228 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4070 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4229 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4076 } 4235 }
4077 4236
4078 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4237 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4079 $sig->send; 4238 $sig->send;
4080 } 4239 }
4081 while (my $sig = shift @WAIT_FOR_TICK) { 4240 $WAIT_FOR_TICK->broadcast;
4082 $sig->send;
4083 }
4084 4241
4085 $LOAD = ($NOW - $TICK_START) / $TICK; 4242 $LOAD = ($NOW - $TICK_START) / $TICK;
4086 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4243 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4087 4244
4088 if (0) { 4245 if (0) {
… …
4094 } 4251 }
4095} 4252}
4096 4253
4097{ 4254{
4098 # configure BDB 4255 # configure BDB
4256 info "initialising database";
4099 4257
4100 BDB::min_parallel 16; 4258 BDB::min_parallel 16;
4101 BDB::max_poll_reqs $TICK * 0.1; 4259 BDB::max_poll_reqs $TICK * 0.1;
4102 $AnyEvent::BDB::WATCHER->priority (1); 4260 #$AnyEvent::BDB::WATCHER->priority (1);
4103 4261
4104 unless ($DB_ENV) { 4262 unless ($DB_ENV) {
4105 $DB_ENV = BDB::db_env_create; 4263 $DB_ENV = BDB::db_env_create;
4106 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4264 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4107 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4265 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4132 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4290 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4133 }; 4291 };
4134 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4292 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4135 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4293 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4136 }; 4294 };
4295
4296 info "database initialised";
4137} 4297}
4138 4298
4139{ 4299{
4140 # configure IO::AIO 4300 # configure IO::AIO
4141 4301
4302 info "initialising aio";
4142 IO::AIO::min_parallel 8; 4303 IO::AIO::min_parallel 8;
4143 IO::AIO::max_poll_time $TICK * 0.1; 4304 IO::AIO::max_poll_time $TICK * 0.1;
4144 undef $AnyEvent::AIO::WATCHER; 4305 undef $AnyEvent::AIO::WATCHER;
4306 info "aio initialised";
4145} 4307}
4146 4308
4147our $_log_backtrace; 4309our $_log_backtrace;
4148our $_log_backtrace_last; 4310our $_log_backtrace_last;
4149 4311

Diff Legend

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