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.591 by root, Tue Nov 6 23:33:15 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 ();
… …
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; # unused 117#our %RESOURCE; # unused
112 118
113our $OUTPUT_RATE_MIN = 3000; 119our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
115 121
116our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
… …
127our $DB_ENV; 133our $DB_ENV;
128 134
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 136
131our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 139
133our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
135our $NOW; 143our $NOW;
136 144
137our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
148 156
149our @POST_INIT; 157our @POST_INIT;
150 158
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
153 164
154binmode STDOUT; 165binmode STDOUT;
155binmode STDERR; 166binmode STDERR;
156 167
157# read virtual server time, if available 168# read virtual server time, if available
… …
191 202
192=over 4 203=over 4
193 204
194=item $cf::UPTIME 205=item $cf::UPTIME
195 206
196The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
197 223
198=item $cf::RUNTIME 224=item $cf::RUNTIME
199 225
200The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 227every server tick.
202 228
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 232
207Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
210database environment. 236database environment.
211 237
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 238=item $cf::LOADAVG
221 239
222The current CPU load on the server (alpha-smoothed), as a value between 0 240The 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 241(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
235=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
236 254
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These 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 256returns 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. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
240 270
241=cut 271=cut
242 272
243sub wait_for_tick(); 273sub wait_for_tick();
244sub wait_for_tick_begin(); 274sub wait_for_tick_begin();
… …
310)) { 340)) {
311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312} 342}
313 343
314$EV::DIED = sub { 344$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
316}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
317 352
318############################################################################# 353#############################################################################
319 354
320=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
321 356
… …
342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343 $d 378 $d
344 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
345} 380}
346 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
347=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
348 435
349Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
350 437
351=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 445
359sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
361 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
362=item $ref = cf::yaml_load $scalar 457=item $ref = cf::decode_yaml $scalar
363 458
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 460
366=cut 461=cut
367 462
368sub fork_call(&@); 463sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
372} 478}
373 479
374=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
375 481
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
460 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
461} 567}
462 568
463=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
464 570
465Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
466This call blocks and returns only when you have at least C<$time> seconds 572(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. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
468 578
469The optional C<$name> can be used to identify the job to run. It might be 579The 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. 580used for statistical purposes and should identify the same time-class.
471 581
472Useful for short background jobs. 582Useful for short background jobs.
… …
501 } 611 }
502 } 612 }
503 613
504 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
505 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
506 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
507 $signal->wait;
508 } else { 617 } else {
509 $busy = 0; 618 $busy = 0;
510 Coro::schedule; 619 Coro::schedule;
511 } 620 }
512 } 621 }
… …
767 876
768 my @data; 877 my @data;
769 my $md5; 878 my $md5;
770 879
771 for (0 .. $#$src) { 880 for (0 .. $#$src) {
772 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
773 or Carp::croak "$src->[$_]: $!";
774 } 882 }
775 883
776 # if processing is expensive, check 884 # if processing is expensive, check
777 # checksum first 885 # checksum first
778 if (1) { 886 if (1) {
… …
1396 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1397 1505
1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399 1507
1400 if (ref $msg) { 1508 if (ref $msg) {
1401 my ($type, $reply, @payload) = 1509 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 1510
1406 my @reply; 1511 my @reply;
1407 1512
1408 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1409 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1431 }; 1536 };
1432 1537
1433 $grp 1538 $grp
1434} 1539}
1435 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1436sub load_extensions { 1552sub load_extensions {
1437 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1438 1556
1439 cf::sync_job { 1557 cf::sync_job {
1440 my %todo; 1558 my %todo;
1441 1559
1442 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1485 unless exists $done{$_}; 1603 unless exists $done{$_};
1486 } 1604 }
1487 1605
1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1490 my $active = eval $v->{source}; 1617 my $active = eval $source;
1491 1618
1492 if (length $@) { 1619 if (length $@) {
1493 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1494 1621
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1512 1639
1513 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1516 } 1643 }
1644
1645 last;
1517 } 1646 }
1518 } 1647 }
1519 }; 1648 };
1520} 1649}
1521 1650
… …
1861sub generate_random_map { 1990sub generate_random_map {
1862 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1863 1992
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865 1994
1866 # mit "rum" bekleckern, nicht
1867 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1868 $rmp, $rmp->{total_map_hp},
1869 (cf::region::find $rmp->{region})
1870 )
1871} 1996}
1872 1997
1873=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1874 1999
1875Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
… …
1953 2078
1954 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1955 () 2080 ()
1956} 2081}
1957 2082
2083# may re-bless or do other evil things
1958sub init { 2084sub init {
1959 my ($self) = @_; 2085 my ($self) = @_;
1960 2086
1961 $self 2087 $self
1962} 2088}
… …
2027 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
2028 2154
2029 1 2155 1
2030} 2156}
2031 2157
2158# used to laod the header of an original map
2032sub load_header_orig { 2159sub load_header_orig {
2033 my ($self) = @_; 2160 my ($self) = @_;
2034 2161
2035 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2036} 2163}
2037 2164
2165# used to laod the header of an instantiated map
2038sub load_header_temp { 2166sub load_header_temp {
2039 my ($self) = @_; 2167 my ($self) = @_;
2040 2168
2041 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2042} 2170}
2043 2171
2172# called after loading the header from an instantiated map
2044sub prepare_temp { 2173sub prepare_temp {
2045 my ($self) = @_; 2174 my ($self) = @_;
2046 2175
2047 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2048 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2049 # safety 2178 # safety
2050 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2051 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2052} 2181}
2053 2182
2183# called after loading the header from an original map
2054sub prepare_orig { 2184sub prepare_orig {
2055 my ($self) = @_; 2185 my ($self) = @_;
2056 2186
2057 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2058 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2084sub find { 2214sub find {
2085 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2086 2216
2087 cf::cede_to_tick; 2217 cf::cede_to_tick;
2088 2218
2089 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2090 2220
2091 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2092 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2093 2223
2094 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2125 2255
2126 { 2256 {
2127 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2128 2258
2129 return unless $self->valid; 2259 return unless $self->valid;
2130 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2131
2132 $self->in_memory (cf::MAP_LOADING);
2133 2261
2134 $self->alloc; 2262 $self->alloc;
2135 2263
2136 $self->pre_load; 2264 $self->pre_load;
2137 cf::cede_to_tick; 2265 cf::cede_to_tick;
2138 2266
2267 if (exists $self->{load_path}) {
2139 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2140 $f->skip_block; 2269 $f->skip_block;
2141 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2142 or return; 2271 or return;
2143 2272
2144 $self->post_load_original 2273 $self->post_load_original
2145 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2146 2275
2147 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2148 utf8::encode $uniq; 2277 utf8::encode $uniq;
2149 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2150 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2151 $self->clear_unique_items; 2280 $self->clear_unique_items;
2152 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2153 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2154 } 2284 }
2155 } 2285 }
2156 }
2157 2286
2158 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2159 2294
2160 cf::cede_to_tick; 2295 cf::cede_to_tick;
2161 # now do the right thing for maps 2296 # now do the right thing for maps
2162 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2163 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2167 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2168 $self->decay_objects; 2303 $self->decay_objects;
2169 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2170 $self->update_buttons; 2305 $self->update_buttons;
2171 cf::cede_to_tick; 2306 cf::cede_to_tick;
2172 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2173 } 2308 }
2174 2309
2175 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2176 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2177
2178 $self->in_memory (cf::MAP_ACTIVE);
2179 } 2312 }
2180 2313
2181 $self->post_load; 2314 $self->post_load;
2182 2315
2183 1 2316 1
… …
2196# if $self->per_party; 2329# if $self->per_party;
2197 2330
2198 $self 2331 $self
2199} 2332}
2200 2333
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 { 2334sub find_sync {
2229 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2230 2336
2337 # it's a bug to call this from the main context
2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2232 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2233 2340
2234 find $path, $origin 2341 find $path, $origin
2235} 2342}
2236 2343
2237sub do_load_sync { 2344sub do_load_sync {
2238 my ($map) = @_; 2345 my ($map) = @_;
2239 2346
2347 # it's a bug to call this from the main context
2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2241 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2242 2350
2243 $map->load; 2351 $map->load;
2244} 2352}
… …
2247our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2248 2356
2249sub find_async { 2357sub find_async {
2250 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2251 2359
2252 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2253 2361
2254 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2255 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2256 } 2364 }
2257 2365
2258 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2259 2367
2260 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2319sub swap_out { 2427sub swap_out {
2320 my ($self) = @_; 2428 my ($self) = @_;
2321 2429
2322 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323 2431
2324 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2325 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2326 return if $self->players; 2434 return if $self->players;
2327 2435
2328 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2329 $self->deactivate; 2437 $self->deactivate;
2330 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2331 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2332 2440
2333 # then atomically save 2441 # then atomically save
2334 $self->_save; 2442 $self->_save;
2335 2443
2336 # then free the map 2444 # then free the map
… …
2362 2470
2363 return if $self->players; 2471 return if $self->players;
2364 2472
2365 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2366 2474
2367 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2368 2476
2369 # need to save uniques path 2477 # need to save uniques path
2370 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2371 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2372 2480
… …
2702 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2703 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2704 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2705 2813
2706 $map->load; 2814 $map->load;
2707 $map->load_neighbours;
2708 2815
2709 return unless $self->contr->active; 2816 return unless $self->contr->active;
2710 2817
2711 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2712 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2768 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2769 } 2876 }
2770 } 2877 }
2771 2878
2772 my $map = eval { 2879 my $map = eval {
2773 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2774 2881
2775 if ($map) { 2882 if ($map) {
2776 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2777 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2778 } else { 2885 } else {
… …
2868 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2869 2976
2870 unless (eval { 2977 unless (eval {
2871 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2872 2979
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; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2882 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2883 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2884 3006
2885 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2886 3008
2887 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2888 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3113=cut 3235=cut
3114 3236
3115sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3116 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3117 3239
3118 if ($self->extcmd == 2) {
3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $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} 3241}
3125 3242
3126=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3127 3244
3128Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3130=cut 3247=cut
3131 3248
3132sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3133 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3134 3251
3135 if ($self->extcmd == 2) {
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $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} 3253}
3143 3254
3144=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3145 3256
3146Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3201 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3202 3313
3203 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3204 3315
3205 if (ref $msg) { 3316 if (ref $msg) {
3206 my ($type, $reply, @payload) = 3317 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 3318
3211 my @reply; 3319 my @reply;
3212 3320
3213 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3214 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3392=cut 3500=cut
3393 3501
3394############################################################################# 3502#############################################################################
3395# the server's init and main functions 3503# the server's init and main functions
3396 3504
3505our %FACEHASH; # hash => idx, #d# HACK for http server
3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3528
3397sub load_facedata($) { 3529sub load_facedata($) {
3398 my ($path) = @_; 3530 my ($path) = @_;
3399 3531
3400 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3401 # for this (global event?) 3533 # for this (global event?)
… …
3403 3535
3404 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3405 3537
3406 trace "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3407 3539
3408 0 < aio_load $path, my $facedata 3540 my $facedata = decode_storable load_file $path;
3409 or die "$path: $!";
3410
3411 $facedata = Coro::Storable::thaw $facedata;
3412 3541
3413 $facedata->{version} == 2 3542 $facedata->{version} == 2
3414 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3415 3544
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; 3545 cf::cede_to_tick;
3424 3546
3425 { 3547 {
3426 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3427 3549
3428 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3429 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3430 3553
3431 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3432 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3433 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3434 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3435 3560
3436 cf::cede_to_tick; 3561 cf::cede_to_tick;
3437 } 3562 }
3438 3563
3439 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3466 3591
3467 { 3592 {
3468 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3469 3594
3470 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3471 if (defined $info->{type}) { 3596 if (defined (my $type = $info->{type})) {
3597 # 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; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3473 3599
3600 cf::face::set_type $idx, $type;
3474 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3475 cf::face::set_type $idx, $info->{type}; 3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d#
3476 } else { 3604 } else {
3477 $RESOURCE{$name} = $info; # unused 3605# $RESOURCE{$name} = $info; # unused
3478 } 3606 }
3479 3607
3480 cf::cede_to_tick; 3608 cf::cede_to_tick;
3481 } 3609 }
3482 } 3610 }
… …
3500 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3501 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3502 cf::arch::commit_load; 3630 cf::arch::commit_load;
3503 3631
3504 $status 3632 $status
3633}
3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3505} 3646}
3506 3647
3507sub reload_regions { 3648sub reload_regions {
3508 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3509 # for this (global event?) 3650 # for this (global event?)
… …
3524} 3665}
3525 3666
3526sub reload_archetypes { 3667sub reload_archetypes {
3527 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3528 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3529} 3679}
3530 3680
3531sub reload_treasures { 3681sub reload_treasures {
3532 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3533 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3534} 3684}
3535 3685
3536sub reload_sound { 3686sub reload_sound {
3537 trace "loading sound config from $DATADIR/sound\n"; 3687 trace "loading sound config from $DATADIR/sound\n";
3538 3688
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); 3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3543 3690
3544 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3545 my $sound = $soundconf->{compat}[$_] 3692 my $sound = $soundconf->{compat}[$_]
3546 or next; 3693 or next;
3547 3694
… …
3554 my $face = cf::face::find "sound/$v"; 3701 my $face = cf::face::find "sound/$v";
3555 cf::sound::set $k => $face; 3702 cf::sound::set $k => $face;
3556 } 3703 }
3557} 3704}
3558 3705
3706sub reload_pod {
3707 trace "loading pods $PODDIR\n";
3708
3709 my @command_help;
3710
3711 for (
3712 [0, "command_help"],
3713 [1, "emote_help"],
3714 [2, "dmcommand_help"],
3715 ) {
3716 my ($type, $path) = @$_;
3717
3718 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3719 or die "unable to load $path";
3720
3721 my $level = 1e9;
3722
3723 for my $par (@$paragraphs) {
3724 if ($par->{type} eq "head2") {
3725 # this code taken almost verbatim from DC/Protocol.pm
3726
3727 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3728 my $cmd = $1;
3729 my @args = split /\|/, $2;
3730 @args = (".*") unless @args;
3731
3732 $_ = $_ eq ".*" ? "" : " $_"
3733 for @args;
3734
3735 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3736
3737 push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
3738 $level = $par->{level};
3739 } else {
3740 error "$par->{markup}: unparsable command heading";
3741 }
3742 } elsif ($par->{level} > $level) {
3743 $command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
3744 }
3745
3746 cf::cede_to_tick;
3747 }
3748 }
3749
3750 @command_help = sort {
3751 $a->[0] <=> $b->[0]
3752 or $a->[1] cmp $b->[1]
3753 } @command_help;
3754
3755 cf::cede_to_tick;
3756
3757 add_face "res/command_help" => FT_RSRC,
3758 JSON::XS->new->utf8->encode (\@command_help);
3759}
3760
3559sub reload_resources { 3761sub reload_resources {
3560 trace "reloading resource files...\n"; 3762 trace "reloading resource files...\n";
3561 3763
3562 reload_exp_table;
3563 reload_materials; 3764 reload_materials;
3564 reload_facedata; 3765 reload_facedata;
3766 reload_exp_table;
3565 reload_sound; 3767 reload_sound;
3566 reload_archetypes; 3768 reload_archetypes;
3567 reload_regions; 3769 reload_regions;
3568 reload_treasures; 3770 reload_treasures;
3771 reload_pod;
3569 3772
3570 trace "finished reloading resource files\n"; 3773 trace "finished reloading resource files\n";
3571} 3774}
3572 3775
3573sub reload_config { 3776sub reload_config {
3574 trace "reloading config file...\n"; 3777 trace "reloading config file...\n";
3575 3778
3576 0 < aio_load "$CONFDIR/config", my $config 3779 my $config = load_file "$CONFDIR/config";
3577 or die "$CONFDIR/config: $!";
3578
3579 utf8::decode $config; 3780 utf8::decode $config;
3580 *CFG = yaml_load $config; 3781 *CFG = decode_yaml $config;
3581 3782
3582 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3783 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3583 3784
3584 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3785 $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}; 3786 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3623 3824
3624sub main { 3825sub main {
3625 cf::init_globals; # initialise logging 3826 cf::init_globals; # initialise logging
3626 3827
3627 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3828 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3628 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3829 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3629 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3830 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3630 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3831 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3631 3832
3632 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3833 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3633 3834
3634 # we must not ever block the main coroutine 3835 # we must not ever block the main coroutine
3635 local $Coro::idle = sub { 3836 $Coro::idle = sub {
3636 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3837 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3637 (async { 3838 (async {
3638 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3839 $Coro::current->{desc} = "IDLE BUG HANDLER";
3639 EV::loop EV::LOOP_ONESHOT; 3840 EV::loop EV::LOOP_ONESHOT;
3640 })->prio (Coro::PRIO_MAX); 3841 })->prio (Coro::PRIO_MAX);
… …
3643 evthread_start IO::AIO::poll_fileno; 3844 evthread_start IO::AIO::poll_fileno;
3644 3845
3645 cf::sync_job { 3846 cf::sync_job {
3646 cf::incloader::init (); 3847 cf::incloader::init ();
3647 3848
3849 db_init;
3850
3648 cf::init_anim; 3851 cf::init_anim;
3649 cf::init_attackmess; 3852 cf::init_attackmess;
3650 cf::init_dynamic; 3853 cf::init_dynamic;
3651 3854
3652 cf::load_settings; 3855 cf::load_settings;
3653 3856
3654 reload_resources; 3857 reload_resources;
3655 reload_config; 3858 reload_config;
3656 db_init;
3657 3859
3658 cf::init_uuid; 3860 cf::init_uuid;
3659 cf::init_signals; 3861 cf::init_signals;
3660 cf::init_skills; 3862 cf::init_skills;
3661 3863
… …
3675 }; 3877 };
3676 3878
3677 cf::object::thawer::errors_are_fatal 0; 3879 cf::object::thawer::errors_are_fatal 0;
3678 info "parse errors in files are no longer fatal from this point on.\n"; 3880 info "parse errors in files are no longer fatal from this point on.\n";
3679 3881
3680 my $free_main; $free_main = EV::idle sub { 3882 AE::postpone {
3681 undef $free_main;
3682 undef &main; # free gobs of memory :) 3883 undef &main; # free gobs of memory :)
3683 }; 3884 };
3684 3885
3685 goto &main_loop; 3886 goto &main_loop;
3686} 3887}
… …
3843 4044
3844 cf::write_runtime_sync; # external watchdog should not bark 4045 cf::write_runtime_sync; # external watchdog should not bark
3845 4046
3846 trace "emergency_perl_save: flushing outstanding aio requests"; 4047 trace "emergency_perl_save: flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) { 4048 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4049 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3849 } 4050 }
3850 4051
3851 cf::write_runtime_sync; # external watchdog should not bark 4052 cf::write_runtime_sync; # external watchdog should not bark
3852 }; 4053 };
3853 4054
… …
4034 4235
4035############################################################################# 4236#############################################################################
4036 4237
4037my $bug_warning = 0; 4238my $bug_warning = 0;
4038 4239
4039our @WAIT_FOR_TICK;
4040our @WAIT_FOR_TICK_BEGIN;
4041
4042sub wait_for_tick() { 4240sub wait_for_tick() {
4043 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4241 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4044 4242
4045 my $signal = new Coro::Signal; 4243 $WAIT_FOR_TICK->wait;
4046 push @WAIT_FOR_TICK, $signal;
4047 $signal->wait;
4048} 4244}
4049 4245
4050sub wait_for_tick_begin() { 4246sub wait_for_tick_begin() {
4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4247 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4052 4248
4053 my $signal = new Coro::Signal; 4249 my $signal = new Coro::Signal;
4054 push @WAIT_FOR_TICK_BEGIN, $signal; 4250 push @WAIT_FOR_TICK_BEGIN, $signal;
4055 $signal->wait; 4251 $signal->wait;
4056} 4252}
… …
4060 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4256 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4061 unless ++$bug_warning > 10; 4257 unless ++$bug_warning > 10;
4062 return; 4258 return;
4063 } 4259 }
4064 4260
4065 cf::server_tick; # one server iteration 4261 cf::one_tick; # one server iteration
4066 4262
4067 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4263 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4068 4264
4069 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4265 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4070 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4266 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4076 } 4272 }
4077 4273
4078 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4274 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4079 $sig->send; 4275 $sig->send;
4080 } 4276 }
4081 while (my $sig = shift @WAIT_FOR_TICK) { 4277 $WAIT_FOR_TICK->broadcast;
4082 $sig->send;
4083 }
4084 4278
4085 $LOAD = ($NOW - $TICK_START) / $TICK; 4279 $LOAD = ($NOW - $TICK_START) / $TICK;
4086 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4280 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4087 4281
4088 if (0) { 4282 if (0) {
… …
4094 } 4288 }
4095} 4289}
4096 4290
4097{ 4291{
4098 # configure BDB 4292 # configure BDB
4293 info "initialising database";
4099 4294
4100 BDB::min_parallel 16; 4295 BDB::min_parallel 16;
4101 BDB::max_poll_reqs $TICK * 0.1; 4296 BDB::max_poll_reqs $TICK * 0.1;
4102 $AnyEvent::BDB::WATCHER->priority (1); 4297 #$AnyEvent::BDB::WATCHER->priority (1);
4103 4298
4104 unless ($DB_ENV) { 4299 unless ($DB_ENV) {
4105 $DB_ENV = BDB::db_env_create; 4300 $DB_ENV = BDB::db_env_create;
4106 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4107 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4302 $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 { }; 4327 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4133 }; 4328 };
4134 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4329 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4135 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4330 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4136 }; 4331 };
4332
4333 info "database initialised";
4137} 4334}
4138 4335
4139{ 4336{
4140 # configure IO::AIO 4337 # configure IO::AIO
4141 4338
4339 info "initialising aio";
4142 IO::AIO::min_parallel 8; 4340 IO::AIO::min_parallel 8;
4143 IO::AIO::max_poll_time $TICK * 0.1; 4341 IO::AIO::max_poll_time $TICK * 0.1;
4144 undef $AnyEvent::AIO::WATCHER; 4342 undef $AnyEvent::AIO::WATCHER;
4343 info "aio initialised";
4145} 4344}
4146 4345
4147our $_log_backtrace; 4346our $_log_backtrace;
4148our $_log_backtrace_last; 4347our $_log_backtrace_last;
4149 4348

Diff Legend

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