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

Diff Legend

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