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.557 by root, Tue Oct 5 21:40:05 2010 UTC vs.
Revision 1.592 by root, Fri Nov 9 00:11:49 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
… …
1949 2078
1950 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1951 () 2080 ()
1952} 2081}
1953 2082
2083# may re-bless or do other evil things
1954sub init { 2084sub init {
1955 my ($self) = @_; 2085 my ($self) = @_;
1956 2086
1957 $self 2087 $self
1958} 2088}
… …
2023 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
2024 2154
2025 1 2155 1
2026} 2156}
2027 2157
2158# used to laod the header of an original map
2028sub load_header_orig { 2159sub load_header_orig {
2029 my ($self) = @_; 2160 my ($self) = @_;
2030 2161
2031 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2032} 2163}
2033 2164
2165# used to laod the header of an instantiated map
2034sub load_header_temp { 2166sub load_header_temp {
2035 my ($self) = @_; 2167 my ($self) = @_;
2036 2168
2037 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2038} 2170}
2039 2171
2172# called after loading the header from an instantiated map
2040sub prepare_temp { 2173sub prepare_temp {
2041 my ($self) = @_; 2174 my ($self) = @_;
2042 2175
2043 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2044 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2045 # safety 2178 # safety
2046 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2047 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2048} 2181}
2049 2182
2183# called after loading the header from an original map
2050sub prepare_orig { 2184sub prepare_orig {
2051 my ($self) = @_; 2185 my ($self) = @_;
2052 2186
2053 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2054 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2080sub find { 2214sub find {
2081 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2082 2216
2083 cf::cede_to_tick; 2217 cf::cede_to_tick;
2084 2218
2085 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2086 2220
2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2088 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2089 2223
2090 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2121 2255
2122 { 2256 {
2123 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2124 2258
2125 return unless $self->valid; 2259 return unless $self->valid;
2126 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2127
2128 $self->in_memory (cf::MAP_LOADING);
2129 2261
2130 $self->alloc; 2262 $self->alloc;
2131 2263
2132 $self->pre_load; 2264 $self->pre_load;
2133 cf::cede_to_tick; 2265 cf::cede_to_tick;
2134 2266
2267 if (exists $self->{load_path}) {
2135 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2136 $f->skip_block; 2269 $f->skip_block;
2137 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2138 or return; 2271 or return;
2139 2272
2140 $self->post_load_original 2273 $self->post_load_original
2141 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2142 2275
2143 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2144 utf8::encode $uniq; 2277 utf8::encode $uniq;
2145 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2146 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2147 $self->clear_unique_items; 2280 $self->clear_unique_items;
2148 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2149 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2150 } 2284 }
2151 } 2285 }
2152 }
2153 2286
2154 $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);
2155 2294
2156 cf::cede_to_tick; 2295 cf::cede_to_tick;
2157 # now do the right thing for maps 2296 # now do the right thing for maps
2158 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2159 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2163 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2164 $self->decay_objects; 2303 $self->decay_objects;
2165 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2166 $self->update_buttons; 2305 $self->update_buttons;
2167 cf::cede_to_tick; 2306 cf::cede_to_tick;
2168 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2169 } 2308 }
2170 2309
2171 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2172 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2173
2174 $self->in_memory (cf::MAP_ACTIVE);
2175 } 2312 }
2176 2313
2177 $self->post_load; 2314 $self->post_load;
2178 2315
2179 1 2316 1
… …
2192# if $self->per_party; 2329# if $self->per_party;
2193 2330
2194 $self 2331 $self
2195} 2332}
2196 2333
2197# find and load all maps in the 3x3 area around a map
2198sub load_neighbours {
2199 my ($map) = @_;
2200
2201 my @neigh; # diagonal neighbours
2202
2203 for (0 .. 3) {
2204 my $neigh = $map->tile_path ($_)
2205 or next;
2206 $neigh = find $neigh, $map
2207 or next;
2208 $neigh->load;
2209
2210 # now find the diagonal neighbours
2211 push @neigh,
2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2214 }
2215
2216 for (grep defined $_->[0], @neigh) {
2217 my ($path, $origin) = @$_;
2218 my $neigh = find $path, $origin
2219 or next;
2220 $neigh->load;
2221 }
2222}
2223
2224sub find_sync { 2334sub find_sync {
2225 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2226 2336
2337 # it's a bug to call this from the main context
2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2229 2340
2230 find $path, $origin 2341 find $path, $origin
2231} 2342}
2232 2343
2233sub do_load_sync { 2344sub do_load_sync {
2234 my ($map) = @_; 2345 my ($map) = @_;
2235 2346
2347 # it's a bug to call this from the main context
2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2238 2350
2239 $map->load; 2351 $map->load;
2240} 2352}
… …
2243our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2244 2356
2245sub find_async { 2357sub find_async {
2246 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2247 2359
2248 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2249 2361
2250 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2252 } 2364 }
2253 2365
2254 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2255 2367
2256 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2315sub swap_out { 2427sub swap_out {
2316 my ($self) = @_; 2428 my ($self) = @_;
2317 2429
2318 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2319 2431
2320 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2321 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2322 return if $self->players; 2434 return if $self->players;
2323 2435
2324 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate; 2437 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2327 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2328 2440
2329 # then atomically save 2441 # then atomically save
2330 $self->_save; 2442 $self->_save;
2331 2443
2332 # then free the map 2444 # then free the map
… …
2358 2470
2359 return if $self->players; 2471 return if $self->players;
2360 2472
2361 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2362 2474
2363 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2364 2476
2365 # need to save uniques path 2477 # need to save uniques path
2366 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368 2480
… …
2698 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2699 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2700 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2701 2813
2702 $map->load; 2814 $map->load;
2703 $map->load_neighbours;
2704 2815
2705 return unless $self->contr->active; 2816 return unless $self->contr->active;
2706 2817
2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2708 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2764 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2765 } 2876 }
2766 } 2877 }
2767 2878
2768 my $map = eval { 2879 my $map = eval {
2769 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2770 2881
2771 if ($map) { 2882 if ($map) {
2772 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2773 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2774 } else { 2885 } else {
… …
2864 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2865 2976
2866 unless (eval { 2977 unless (eval {
2867 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2868 2979
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2878 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2879 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 }
2880 3006
2881 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2882 3008
2883 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3109=cut 3235=cut
3110 3236
3111sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3112 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3113 3239
3114 if ($self->extcmd == 2) {
3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116 } elsif ($self->extcmd == 1) { # TODO: remove
3117 push @msg, msgtype => "event_$type";
3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119 }
3120} 3241}
3121 3242
3122=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3123 3244
3124Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3126=cut 3247=cut
3127 3248
3128sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3129 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3130 3251
3131 if ($self->extcmd == 2) {
3132 $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]));
3133 } elsif ($self->extcmd == 1) {
3134 #TODO: version 1, remove
3135 unshift @msg, msgtype => "reply", msgid => $id;
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137 }
3138} 3253}
3139 3254
3140=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3141 3256
3142Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3197 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3198 3313
3199 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3200 3315
3201 if (ref $msg) { 3316 if (ref $msg) {
3202 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3203 "ARRAY" eq ref $msg
3204 ? @$msg
3205 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206 3318
3207 my @reply; 3319 my @reply;
3208 3320
3209 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3210 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3388=cut 3500=cut
3389 3501
3390############################################################################# 3502#############################################################################
3391# the server's init and main functions 3503# the server's init and main functions
3392 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
3393sub load_facedata($) { 3529sub load_facedata($) {
3394 my ($path) = @_; 3530 my ($path) = @_;
3395 3531
3396 # 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
3397 # for this (global event?) 3533 # for this (global event?)
… …
3399 3535
3400 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401 3537
3402 trace "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3403 3539
3404 0 < aio_load $path, my $facedata 3540 my $facedata = decode_storable load_file $path;
3405 or die "$path: $!";
3406
3407 $facedata = Coro::Storable::thaw $facedata;
3408 3541
3409 $facedata->{version} == 2 3542 $facedata->{version} == 2
3410 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3411 3544
3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3414 $facedata->{resource}{"res/exp_table"} = {
3415 type => FT_RSRC,
3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3418 };
3419 cf::cede_to_tick; 3545 cf::cede_to_tick;
3420 3546
3421 { 3547 {
3422 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3423 3549
3424 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3425 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426 3553
3427 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3428 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, "-", chr $idx & 255; 3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3432 3560
3433 cf::cede_to_tick; 3561 cf::cede_to_tick;
3434 } 3562 }
3435 3563
3436 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3463 3591
3464 { 3592 {
3465 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3466 3594
3467 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3468 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
3469 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3470 3599
3600 cf::face::set_type $idx, $type;
3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3472 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#
3473 } else { 3604 } else {
3474 $RESOURCE{$name} = $info; # unused 3605# $RESOURCE{$name} = $info; # unused
3475 } 3606 }
3476 3607
3477 cf::cede_to_tick; 3608 cf::cede_to_tick;
3478 } 3609 }
3479 } 3610 }
… …
3497 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3498 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3499 cf::arch::commit_load; 3630 cf::arch::commit_load;
3500 3631
3501 $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;
3502} 3646}
3503 3647
3504sub reload_regions { 3648sub reload_regions {
3505 # 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
3506 # for this (global event?) 3650 # for this (global event?)
… …
3521} 3665}
3522 3666
3523sub reload_archetypes { 3667sub reload_archetypes {
3524 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3525 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 );
3526} 3679}
3527 3680
3528sub reload_treasures { 3681sub reload_treasures {
3529 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3530 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3531} 3684}
3532 3685
3533sub reload_sound { 3686sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n"; 3687 trace "loading sound config from $DATADIR/sound\n";
3535 3688
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3540 3690
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_] 3692 my $sound = $soundconf->{compat}[$_]
3543 or next; 3693 or next;
3544 3694
… …
3551 my $face = cf::face::find "sound/$v"; 3701 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face; 3702 cf::sound::set $k => $face;
3553 } 3703 }
3554} 3704}
3555 3705
3706#d# move docstuff to help or so
3707our %DOCSTRING;
3708
3709sub reload_pod {
3710 trace "loading pods $PODDIR\n";
3711
3712 %DOCSTRING = ();
3713 my @command_list;
3714
3715 for (
3716 [0, "command_help"],
3717 [1, "emote_help"],
3718 [2, "dmcommand_help"],
3719 ) {
3720 my ($type, $path) = @$_;
3721
3722 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3723 or die "unable to load $path";
3724
3725 my $level = 1e9;
3726 my $rpar;
3727
3728 for my $par (@$paragraphs) {
3729 if ($par->{type} eq "head2") {
3730 # this code taken almost verbatim from DC/Protocol.pm
3731
3732 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3733 my $cmd = $1;
3734 my @args = split /\|/, $2;
3735 @args = (".*") unless @args;
3736
3737 $_ = $_ eq ".*" ? "" : " $_"
3738 for @args;
3739
3740 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3741
3742 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3743
3744 push @command_list, [$type, \@variants];
3745 $level = $par->{level};
3746 } else {
3747 error "$par->{markup}: unparsable command heading";
3748 }
3749 } elsif ($par->{level} > $level) {
3750 $$rpar .= &cf::pod::as_cfpod ([$par]);
3751 }
3752
3753 cf::cede_to_tick;
3754 }
3755 }
3756
3757 @command_list = sort {
3758 $a->[0] <=> $b->[0]
3759 or $a->[1] cmp $b->[1]
3760 } @command_list;
3761
3762 cf::cede_to_tick;
3763
3764 add_face "res/command_list" => FT_RSRC,
3765 JSON::XS->new->utf8->encode (\@command_list);
3766}
3767
3556sub reload_resources { 3768sub reload_resources {
3557 trace "reloading resource files...\n"; 3769 trace "reloading resource files...\n";
3558 3770
3559 reload_exp_table;
3560 reload_materials; 3771 reload_materials;
3561 reload_facedata; 3772 reload_facedata;
3773 reload_exp_table;
3562 reload_sound; 3774 reload_sound;
3563 reload_archetypes; 3775 reload_archetypes;
3564 reload_regions; 3776 reload_regions;
3565 reload_treasures; 3777 reload_treasures;
3778 reload_pod;
3566 3779
3567 trace "finished reloading resource files\n"; 3780 trace "finished reloading resource files\n";
3568} 3781}
3569 3782
3570sub reload_config { 3783sub reload_config {
3571 trace "reloading config file...\n"; 3784 trace "reloading config file...\n";
3572 3785
3573 0 < aio_load "$CONFDIR/config", my $config 3786 my $config = load_file "$CONFDIR/config";
3574 or die "$CONFDIR/config: $!";
3575
3576 utf8::decode $config; 3787 utf8::decode $config;
3577 *CFG = yaml_load $config; 3788 *CFG = decode_yaml $config;
3578 3789
3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3790 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3580 3791
3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3792 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3793 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3620 3831
3621sub main { 3832sub main {
3622 cf::init_globals; # initialise logging 3833 cf::init_globals; # initialise logging
3623 3834
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3835 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3836 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3837 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3838 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628 3839
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3840 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630 3841
3631 # we must not ever block the main coroutine 3842 # we must not ever block the main coroutine
3632 local $Coro::idle = sub { 3843 $Coro::idle = sub {
3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3844 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3634 (async { 3845 (async {
3635 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3846 $Coro::current->{desc} = "IDLE BUG HANDLER";
3636 EV::loop EV::LOOP_ONESHOT; 3847 EV::loop EV::LOOP_ONESHOT;
3637 })->prio (Coro::PRIO_MAX); 3848 })->prio (Coro::PRIO_MAX);
… …
3640 evthread_start IO::AIO::poll_fileno; 3851 evthread_start IO::AIO::poll_fileno;
3641 3852
3642 cf::sync_job { 3853 cf::sync_job {
3643 cf::incloader::init (); 3854 cf::incloader::init ();
3644 3855
3856 db_init;
3857
3645 cf::init_anim; 3858 cf::init_anim;
3646 cf::init_attackmess; 3859 cf::init_attackmess;
3647 cf::init_dynamic; 3860 cf::init_dynamic;
3648 3861
3649 cf::load_settings; 3862 cf::load_settings;
3650 3863
3651 reload_resources; 3864 reload_resources;
3652 reload_config; 3865 reload_config;
3653 db_init;
3654 3866
3655 cf::init_uuid; 3867 cf::init_uuid;
3656 cf::init_signals; 3868 cf::init_signals;
3657 cf::init_skills; 3869 cf::init_skills;
3658 3870
… …
3672 }; 3884 };
3673 3885
3674 cf::object::thawer::errors_are_fatal 0; 3886 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n"; 3887 info "parse errors in files are no longer fatal from this point on.\n";
3676 3888
3677 my $free_main; $free_main = EV::idle sub { 3889 AE::postpone {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :) 3890 undef &main; # free gobs of memory :)
3680 }; 3891 };
3681 3892
3682 goto &main_loop; 3893 goto &main_loop;
3683} 3894}
… …
3840 4051
3841 cf::write_runtime_sync; # external watchdog should not bark 4052 cf::write_runtime_sync; # external watchdog should not bark
3842 4053
3843 trace "emergency_perl_save: flushing outstanding aio requests"; 4054 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) { 4055 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4056 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3846 } 4057 }
3847 4058
3848 cf::write_runtime_sync; # external watchdog should not bark 4059 cf::write_runtime_sync; # external watchdog should not bark
3849 }; 4060 };
3850 4061
… …
4031 4242
4032############################################################################# 4243#############################################################################
4033 4244
4034my $bug_warning = 0; 4245my $bug_warning = 0;
4035 4246
4036our @WAIT_FOR_TICK;
4037our @WAIT_FOR_TICK_BEGIN;
4038
4039sub wait_for_tick() { 4247sub wait_for_tick() {
4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4248 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4041 4249
4042 my $signal = new Coro::Signal; 4250 $WAIT_FOR_TICK->wait;
4043 push @WAIT_FOR_TICK, $signal;
4044 $signal->wait;
4045} 4251}
4046 4252
4047sub wait_for_tick_begin() { 4253sub wait_for_tick_begin() {
4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4254 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4049 4255
4050 my $signal = new Coro::Signal; 4256 my $signal = new Coro::Signal;
4051 push @WAIT_FOR_TICK_BEGIN, $signal; 4257 push @WAIT_FOR_TICK_BEGIN, $signal;
4052 $signal->wait; 4258 $signal->wait;
4053} 4259}
… …
4057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4263 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4058 unless ++$bug_warning > 10; 4264 unless ++$bug_warning > 10;
4059 return; 4265 return;
4060 } 4266 }
4061 4267
4062 cf::server_tick; # one server iteration 4268 cf::one_tick; # one server iteration
4063 4269
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4270 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065 4271
4066 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4272 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4273 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4073 } 4279 }
4074 4280
4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4281 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4076 $sig->send; 4282 $sig->send;
4077 } 4283 }
4078 while (my $sig = shift @WAIT_FOR_TICK) { 4284 $WAIT_FOR_TICK->broadcast;
4079 $sig->send;
4080 }
4081 4285
4082 $LOAD = ($NOW - $TICK_START) / $TICK; 4286 $LOAD = ($NOW - $TICK_START) / $TICK;
4083 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4287 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4084 4288
4085 if (0) { 4289 if (0) {
… …
4091 } 4295 }
4092} 4296}
4093 4297
4094{ 4298{
4095 # configure BDB 4299 # configure BDB
4300 info "initialising database";
4096 4301
4097 BDB::min_parallel 16; 4302 BDB::min_parallel 16;
4098 BDB::max_poll_reqs $TICK * 0.1; 4303 BDB::max_poll_reqs $TICK * 0.1;
4099 $AnyEvent::BDB::WATCHER->priority (1); 4304 #$AnyEvent::BDB::WATCHER->priority (1);
4100 4305
4101 unless ($DB_ENV) { 4306 unless ($DB_ENV) {
4102 $DB_ENV = BDB::db_env_create; 4307 $DB_ENV = BDB::db_env_create;
4103 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4308 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4104 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4309 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4129 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4334 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4130 }; 4335 };
4131 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4336 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4132 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4337 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4133 }; 4338 };
4339
4340 info "database initialised";
4134} 4341}
4135 4342
4136{ 4343{
4137 # configure IO::AIO 4344 # configure IO::AIO
4138 4345
4346 info "initialising aio";
4139 IO::AIO::min_parallel 8; 4347 IO::AIO::min_parallel 8;
4140 IO::AIO::max_poll_time $TICK * 0.1; 4348 IO::AIO::max_poll_time $TICK * 0.1;
4141 undef $AnyEvent::AIO::WATCHER; 4349 undef $AnyEvent::AIO::WATCHER;
4350 info "aio initialised";
4142} 4351}
4143 4352
4144our $_log_backtrace; 4353our $_log_backtrace;
4145our $_log_backtrace_last; 4354our $_log_backtrace_last;
4146 4355

Diff Legend

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