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.550 by root, Fri May 14 22:56:47 2010 UTC vs.
Revision 1.590 by root, Sun Nov 4 02:20:11 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 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.
… …
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->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1871 $rmp->{exit_on_final_map},
1872 $rmp->{xsize}, $rmp->{ysize},
1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1875 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1876 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1877 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1878 (cf::region::find $rmp->{region}), $rmp->{custom}
1879 )
1880} 1996}
1881 1997
1882=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1883 1999
1884Register 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
… …
1935 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1936 $path = "$base/$path"; 2052 $path = "$base/$path";
1937 } 2053 }
1938 2054
1939 for ($path) { 2055 for ($path) {
1940 redo if s{//}{/};
1941 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1942 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1943 } 2058 }
1944 2059
1945 $path 2060 $path
… …
1963 2078
1964 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1965 () 2080 ()
1966} 2081}
1967 2082
2083# may re-bless or do other evil things
1968sub init { 2084sub init {
1969 my ($self) = @_; 2085 my ($self) = @_;
1970 2086
1971 $self 2087 $self
1972} 2088}
… …
2037 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
2038 2154
2039 1 2155 1
2040} 2156}
2041 2157
2158# used to laod the header of an original map
2042sub load_header_orig { 2159sub load_header_orig {
2043 my ($self) = @_; 2160 my ($self) = @_;
2044 2161
2045 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2046} 2163}
2047 2164
2165# used to laod the header of an instantiated map
2048sub load_header_temp { 2166sub load_header_temp {
2049 my ($self) = @_; 2167 my ($self) = @_;
2050 2168
2051 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2052} 2170}
2053 2171
2172# called after loading the header from an instantiated map
2054sub prepare_temp { 2173sub prepare_temp {
2055 my ($self) = @_; 2174 my ($self) = @_;
2056 2175
2057 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2058 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2059 # safety 2178 # safety
2060 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2061 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2062} 2181}
2063 2182
2183# called after loading the header from an original map
2064sub prepare_orig { 2184sub prepare_orig {
2065 my ($self) = @_; 2185 my ($self) = @_;
2066 2186
2067 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2068 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2094sub find { 2214sub find {
2095 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2096 2216
2097 cf::cede_to_tick; 2217 cf::cede_to_tick;
2098 2218
2099 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2100 2220
2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2102 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2103 2223
2104 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2135 2255
2136 { 2256 {
2137 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2138 2258
2139 return unless $self->valid; 2259 return unless $self->valid;
2140 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2141
2142 $self->in_memory (cf::MAP_LOADING);
2143 2261
2144 $self->alloc; 2262 $self->alloc;
2145 2263
2146 $self->pre_load; 2264 $self->pre_load;
2147 cf::cede_to_tick; 2265 cf::cede_to_tick;
2148 2266
2267 if (exists $self->{load_path}) {
2149 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2150 $f->skip_block; 2269 $f->skip_block;
2151 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2152 or return; 2271 or return;
2153 2272
2154 $self->post_load_original 2273 $self->post_load_original
2155 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2156 2275
2157 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2158 utf8::encode $uniq; 2277 utf8::encode $uniq;
2159 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2160 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2161 $self->clear_unique_items; 2280 $self->clear_unique_items;
2162 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2163 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2164 } 2284 }
2165 } 2285 }
2166 }
2167 2286
2168 $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);
2169 2294
2170 cf::cede_to_tick; 2295 cf::cede_to_tick;
2171 # now do the right thing for maps 2296 # now do the right thing for maps
2172 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2173 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2177 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2178 $self->decay_objects; 2303 $self->decay_objects;
2179 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2180 $self->update_buttons; 2305 $self->update_buttons;
2181 cf::cede_to_tick; 2306 cf::cede_to_tick;
2182 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2183 } 2308 }
2184 2309
2185 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2186 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2187
2188 $self->in_memory (cf::MAP_ACTIVE);
2189 } 2312 }
2190 2313
2191 $self->post_load; 2314 $self->post_load;
2315
2316 1
2192} 2317}
2193 2318
2194# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2195# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2196# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2204# if $self->per_party; 2329# if $self->per_party;
2205 2330
2206 $self 2331 $self
2207} 2332}
2208 2333
2209# find and load all maps in the 3x3 area around a map
2210sub load_neighbours {
2211 my ($map) = @_;
2212
2213 my @neigh; # diagonal neighbours
2214
2215 for (0 .. 3) {
2216 my $neigh = $map->tile_path ($_)
2217 or next;
2218 $neigh = find $neigh, $map
2219 or next;
2220 $neigh->load;
2221
2222 # now find the diagonal neighbours
2223 push @neigh,
2224 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2225 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2226 }
2227
2228 for (grep defined $_->[0], @neigh) {
2229 my ($path, $origin) = @$_;
2230 my $neigh = find $path, $origin
2231 or next;
2232 $neigh->load;
2233 }
2234}
2235
2236sub find_sync { 2334sub find_sync {
2237 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2238 2336
2337 # it's a bug to call this from the main context
2239 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2240 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2241 2340
2242 find $path, $origin 2341 find $path, $origin
2243} 2342}
2244 2343
2245sub do_load_sync { 2344sub do_load_sync {
2246 my ($map) = @_; 2345 my ($map) = @_;
2247 2346
2347 # it's a bug to call this from the main context
2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2249 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2250 2350
2251 $map->load; 2351 $map->load;
2252} 2352}
… …
2255our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2256 2356
2257sub find_async { 2357sub find_async {
2258 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2259 2359
2260 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2261 2361
2262 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2263 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2264 } 2364 }
2265 2365
2266 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2267 2367
2268 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2327sub swap_out { 2427sub swap_out {
2328 my ($self) = @_; 2428 my ($self) = @_;
2329 2429
2330 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2331 2431
2332 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2333 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2334 return if $self->players; 2434 return if $self->players;
2335 2435
2336 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2337 $self->deactivate; 2437 $self->deactivate;
2338 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2339 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2340 2440
2341 # then atomically save 2441 # then atomically save
2342 $self->_save; 2442 $self->_save;
2343 2443
2344 # then free the map 2444 # then free the map
… …
2370 2470
2371 return if $self->players; 2471 return if $self->players;
2372 2472
2373 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2374 2474
2375 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2376 2476
2377 # need to save uniques path 2477 # need to save uniques path
2378 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2379 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2380 2480
… …
2710 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2711 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2712 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2713 2813
2714 $map->load; 2814 $map->load;
2715 $map->load_neighbours;
2716 2815
2717 return unless $self->contr->active; 2816 return unless $self->contr->active;
2718 2817
2719 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2720 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2776 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2777 } 2876 }
2778 } 2877 }
2779 2878
2780 my $map = eval { 2879 my $map = eval {
2781 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2782 2881
2783 if ($map) { 2882 if ($map) {
2784 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2785 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2786 } else { 2885 } else {
… …
2876 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2877 2976
2878 unless (eval { 2977 unless (eval {
2879 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2880 2979
2881 # random map handling
2882 {
2883 my $guard = cf::lock_acquire "exit_prepare:$exit";
2884
2885 prepare_random_map $exit
2886 if $exit->slaying eq "/!";
2887 }
2888
2889 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2890 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2891 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 }
2892 3006
2893 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2894 3008
2895 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2896 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3121=cut 3235=cut
3122 3236
3123sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3124 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3125 3239
3126 if ($self->extcmd == 2) {
3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3128 } elsif ($self->extcmd == 1) { # TODO: remove
3129 push @msg, msgtype => "event_$type";
3130 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3131 }
3132} 3241}
3133 3242
3134=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3135 3244
3136Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3138=cut 3247=cut
3139 3248
3140sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3141 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3142 3251
3143 if ($self->extcmd == 2) {
3144 $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]));
3145 } elsif ($self->extcmd == 1) {
3146 #TODO: version 1, remove
3147 unshift @msg, msgtype => "reply", msgid => $id;
3148 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3149 }
3150} 3253}
3151 3254
3152=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3153 3256
3154Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3209 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3210 3313
3211 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3212 3315
3213 if (ref $msg) { 3316 if (ref $msg) {
3214 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3215 "ARRAY" eq ref $msg
3216 ? @$msg
3217 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3218 3318
3219 my @reply; 3319 my @reply;
3220 3320
3221 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3222 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3400=cut 3500=cut
3401 3501
3402############################################################################# 3502#############################################################################
3403# the server's init and main functions 3503# the server's init and main functions
3404 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
3405sub load_facedata($) { 3529sub load_facedata($) {
3406 my ($path) = @_; 3530 my ($path) = @_;
3407 3531
3408 # 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
3409 # for this (global event?) 3533 # for this (global event?)
… …
3411 3535
3412 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3413 3537
3414 trace "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3415 3539
3416 0 < aio_load $path, my $facedata 3540 my $facedata = decode_storable load_file $path;
3417 or die "$path: $!";
3418
3419 $facedata = Coro::Storable::thaw $facedata;
3420 3541
3421 $facedata->{version} == 2 3542 $facedata->{version} == 2
3422 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3423 3544
3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3426 $facedata->{resource}{"res/exp_table"} = {
3427 type => FT_RSRC,
3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3430 };
3431 cf::cede_to_tick; 3545 cf::cede_to_tick;
3432 3546
3433 { 3547 {
3434 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3435 3549
3436 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3437 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3438 3553
3439 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3440 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3442 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#
3443 3560
3444 cf::cede_to_tick; 3561 cf::cede_to_tick;
3445 } 3562 }
3446 3563
3447 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3474 3591
3475 { 3592 {
3476 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3477 3594
3478 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3479 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
3480 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3481 3599
3600 cf::face::set_type $idx, $type;
3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3483 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#
3484 } else { 3604 } else {
3485 $RESOURCE{$name} = $info; # unused 3605# $RESOURCE{$name} = $info; # unused
3486 } 3606 }
3487 3607
3488 cf::cede_to_tick; 3608 cf::cede_to_tick;
3489 } 3609 }
3490 } 3610 }
… …
3508 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3509 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3510 cf::arch::commit_load; 3630 cf::arch::commit_load;
3511 3631
3512 $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;
3513} 3646}
3514 3647
3515sub reload_regions { 3648sub reload_regions {
3516 # 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
3517 # for this (global event?) 3650 # for this (global event?)
… …
3532} 3665}
3533 3666
3534sub reload_archetypes { 3667sub reload_archetypes {
3535 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3536 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 );
3537} 3679}
3538 3680
3539sub reload_treasures { 3681sub reload_treasures {
3540 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3541 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3542} 3684}
3543 3685
3544sub reload_sound { 3686sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n"; 3687 trace "loading sound config from $DATADIR/sound\n";
3546 3688
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551 3690
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_] 3692 my $sound = $soundconf->{compat}[$_]
3554 or next; 3693 or next;
3555 3694
… …
3565} 3704}
3566 3705
3567sub reload_resources { 3706sub reload_resources {
3568 trace "reloading resource files...\n"; 3707 trace "reloading resource files...\n";
3569 3708
3570 reload_exp_table;
3571 reload_materials; 3709 reload_materials;
3572 reload_facedata; 3710 reload_facedata;
3711 reload_exp_table;
3573 reload_sound; 3712 reload_sound;
3574 reload_archetypes; 3713 reload_archetypes;
3575 reload_regions; 3714 reload_regions;
3576 reload_treasures; 3715 reload_treasures;
3577 3716
… …
3579} 3718}
3580 3719
3581sub reload_config { 3720sub reload_config {
3582 trace "reloading config file...\n"; 3721 trace "reloading config file...\n";
3583 3722
3584 0 < aio_load "$CONFDIR/config", my $config 3723 my $config = load_file "$CONFDIR/config";
3585 or die "$CONFDIR/config: $!";
3586
3587 utf8::decode $config; 3724 utf8::decode $config;
3588 *CFG = yaml_load $config; 3725 *CFG = decode_yaml $config;
3589 3726
3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3727 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3591 3728
3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3729 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3730 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3631 3768
3632sub main { 3769sub main {
3633 cf::init_globals; # initialise logging 3770 cf::init_globals; # initialise logging
3634 3771
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3772 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3773 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3774 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3775 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639 3776
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3777 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641 3778
3642 # we must not ever block the main coroutine 3779 # we must not ever block the main coroutine
3643 local $Coro::idle = sub { 3780 $Coro::idle = sub {
3644 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3781 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3645 (async { 3782 (async {
3646 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3783 $Coro::current->{desc} = "IDLE BUG HANDLER";
3647 EV::loop EV::LOOP_ONESHOT; 3784 EV::loop EV::LOOP_ONESHOT;
3648 })->prio (Coro::PRIO_MAX); 3785 })->prio (Coro::PRIO_MAX);
… …
3683 }; 3820 };
3684 3821
3685 cf::object::thawer::errors_are_fatal 0; 3822 cf::object::thawer::errors_are_fatal 0;
3686 info "parse errors in files are no longer fatal from this point on.\n"; 3823 info "parse errors in files are no longer fatal from this point on.\n";
3687 3824
3688 my $free_main; $free_main = EV::idle sub { 3825 AE::postpone {
3689 undef $free_main;
3690 undef &main; # free gobs of memory :) 3826 undef &main; # free gobs of memory :)
3691 }; 3827 };
3692 3828
3693 goto &main_loop; 3829 goto &main_loop;
3694} 3830}
… …
3851 3987
3852 cf::write_runtime_sync; # external watchdog should not bark 3988 cf::write_runtime_sync; # external watchdog should not bark
3853 3989
3854 trace "emergency_perl_save: flushing outstanding aio requests"; 3990 trace "emergency_perl_save: flushing outstanding aio requests";
3855 while (IO::AIO::nreqs || BDB::nreqs) { 3991 while (IO::AIO::nreqs || BDB::nreqs) {
3856 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3992 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3857 } 3993 }
3858 3994
3859 cf::write_runtime_sync; # external watchdog should not bark 3995 cf::write_runtime_sync; # external watchdog should not bark
3860 }; 3996 };
3861 3997
… …
4042 4178
4043############################################################################# 4179#############################################################################
4044 4180
4045my $bug_warning = 0; 4181my $bug_warning = 0;
4046 4182
4047our @WAIT_FOR_TICK;
4048our @WAIT_FOR_TICK_BEGIN;
4049
4050sub wait_for_tick() { 4183sub wait_for_tick() {
4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4184 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4052 4185
4053 my $signal = new Coro::Signal; 4186 $WAIT_FOR_TICK->wait;
4054 push @WAIT_FOR_TICK, $signal;
4055 $signal->wait;
4056} 4187}
4057 4188
4058sub wait_for_tick_begin() { 4189sub wait_for_tick_begin() {
4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4190 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4060 4191
4061 my $signal = new Coro::Signal; 4192 my $signal = new Coro::Signal;
4062 push @WAIT_FOR_TICK_BEGIN, $signal; 4193 push @WAIT_FOR_TICK_BEGIN, $signal;
4063 $signal->wait; 4194 $signal->wait;
4064} 4195}
… …
4068 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4199 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4069 unless ++$bug_warning > 10; 4200 unless ++$bug_warning > 10;
4070 return; 4201 return;
4071 } 4202 }
4072 4203
4073 cf::server_tick; # one server iteration 4204 cf::one_tick; # one server iteration
4074 4205
4075 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4206 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4076 4207
4077 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4208 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4078 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4209 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4084 } 4215 }
4085 4216
4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4217 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4087 $sig->send; 4218 $sig->send;
4088 } 4219 }
4089 while (my $sig = shift @WAIT_FOR_TICK) { 4220 $WAIT_FOR_TICK->broadcast;
4090 $sig->send;
4091 }
4092 4221
4093 $LOAD = ($NOW - $TICK_START) / $TICK; 4222 $LOAD = ($NOW - $TICK_START) / $TICK;
4094 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4095 4224
4096 if (0) { 4225 if (0) {
… …
4105{ 4234{
4106 # configure BDB 4235 # configure BDB
4107 4236
4108 BDB::min_parallel 16; 4237 BDB::min_parallel 16;
4109 BDB::max_poll_reqs $TICK * 0.1; 4238 BDB::max_poll_reqs $TICK * 0.1;
4110 $AnyEvent::BDB::WATCHER->priority (1); 4239 #$AnyEvent::BDB::WATCHER->priority (1);
4111 4240
4112 unless ($DB_ENV) { 4241 unless ($DB_ENV) {
4113 $DB_ENV = BDB::db_env_create; 4242 $DB_ENV = BDB::db_env_create;
4114 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4243 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4115 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4244 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4150 IO::AIO::min_parallel 8; 4279 IO::AIO::min_parallel 8;
4151 IO::AIO::max_poll_time $TICK * 0.1; 4280 IO::AIO::max_poll_time $TICK * 0.1;
4152 undef $AnyEvent::AIO::WATCHER; 4281 undef $AnyEvent::AIO::WATCHER;
4153} 4282}
4154 4283
4155my $_log_backtrace; 4284our $_log_backtrace;
4285our $_log_backtrace_last;
4156 4286
4157sub _log_backtrace { 4287sub _log_backtrace {
4158 my ($msg, @addr) = @_; 4288 my ($msg, @addr) = @_;
4159 4289
4160 $msg =~ s/\n//; 4290 $msg =~ s/\n$//;
4161 4291
4292 if ($_log_backtrace_last eq $msg) {
4293 LOG llevInfo, "[ABT] $msg\n";
4294 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4162 # limit the # of concurrent backtraces 4295 # limit the # of concurrent backtraces
4163 if ($_log_backtrace < 2) { 4296 } elsif ($_log_backtrace < 2) {
4297 $_log_backtrace_last = $msg;
4164 ++$_log_backtrace; 4298 ++$_log_backtrace;
4165 my $perl_bt = Carp::longmess $msg; 4299 my $perl_bt = Carp::longmess $msg;
4166 async { 4300 async {
4167 $Coro::current->{desc} = "abt $msg"; 4301 $Coro::current->{desc} = "abt $msg";
4168 4302
… …
4188 LOG llevInfo, "[ABT] $_\n" for @bt; 4322 LOG llevInfo, "[ABT] $_\n" for @bt;
4189 --$_log_backtrace; 4323 --$_log_backtrace;
4190 }; 4324 };
4191 } else { 4325 } else {
4192 LOG llevInfo, "[ABT] $msg\n"; 4326 LOG llevInfo, "[ABT] $msg\n";
4193 LOG llevInfo, "[ABT] [suppressed]\n"; 4327 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4194 } 4328 }
4195} 4329}
4196 4330
4197# load additional modules 4331# load additional modules
4198require "cf/$_.pm" for @EXTRA_MODULES; 4332require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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