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.560 by root, Fri Apr 22 02:03:12 2011 UTC vs.
Revision 1.592 by root, Fri Nov 9 00:11:49 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
… …
108our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 116
113our %RESOURCE; # unused 117#our %RESOURCE; # unused
114 118
115our $OUTPUT_RATE_MIN = 3000; 119our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
117 121
118our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
… …
129our $DB_ENV; 133our $DB_ENV;
130 134
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 136
133our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 139
135our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
137our $NOW; 143our $NOW;
138 144
139our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
150 156
151our @POST_INIT; 157our @POST_INIT;
152 158
153our $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)
154our $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;
155 164
156binmode STDOUT; 165binmode STDOUT;
157binmode STDERR; 166binmode STDERR;
158 167
159# read virtual server time, if available 168# read virtual server time, if available
… …
193 202
194=over 4 203=over 4
195 204
196=item $cf::UPTIME 205=item $cf::UPTIME
197 206
198The 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.
199 223
200=item $cf::RUNTIME 224=item $cf::RUNTIME
201 225
202The 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
203every server tick. 227every server tick.
204 228
205=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208 232
209Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
212database environment. 236database environment.
213 237
214=item $cf::NOW
215
216The time of the last (current) server tick.
217
218=item $cf::TICK
219
220The interval between server ticks, in seconds.
221
222=item $cf::LOADAVG 238=item $cf::LOADAVG
223 239
224The 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
225(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
226objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
238 254
239These 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
240returns 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
241per 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.
242 270
243=cut 271=cut
244 272
245sub wait_for_tick(); 273sub wait_for_tick();
246sub wait_for_tick_begin(); 274sub wait_for_tick_begin();
… …
312)) { 340)) {
313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314} 342}
315 343
316$EV::DIED = sub { 344$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
318}; 346};
319 347
320############################################################################# 348#############################################################################
321 349
322sub fork_call(&@); 350sub fork_call(&@);
… …
349 $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;
350 $d 378 $d
351 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
352} 380}
353 381
354=item $scalar = load_file $path 382=item $scalar = cf::load_file $path
355 383
356Loads the given file from path and returns its contents. Croaks on error 384Loads the given file from path and returns its contents. Croaks on error
357and can block. 385and can block.
358 386
359=cut 387=cut
… …
361sub load_file($) { 389sub load_file($) {
362 0 <= aio_load $_[0], my $data 390 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 391 or Carp::croak "$_[0]: $!";
364 392
365 $data 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
366} 432}
367 433
368=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
369 435
370Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
… …
545 } 611 }
546 } 612 }
547 613
548 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
549 # 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
550 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 617 } else {
553 $busy = 0; 618 $busy = 0;
554 Coro::schedule; 619 Coro::schedule;
555 } 620 }
556 } 621 }
… …
1439 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1440 1505
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1507
1443 if (ref $msg) { 1508 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448 1510
1449 my @reply; 1511 my @reply;
1450 1512
1451 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1474 }; 1536 };
1475 1537
1476 $grp 1538 $grp
1477} 1539}
1478 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
1479sub load_extensions { 1552sub load_extensions {
1480 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1481 1556
1482 cf::sync_job { 1557 cf::sync_job {
1483 my %todo; 1558 my %todo;
1484 1559
1485 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1528 unless exists $done{$_}; 1603 unless exists $done{$_};
1529 } 1604 }
1530 1605
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 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
1533 my $active = eval $v->{source}; 1617 my $active = eval $source;
1534 1618
1535 if (length $@) { 1619 if (length $@) {
1536 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1537 1621
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1555 1639
1556 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1559 } 1643 }
1644
1645 last;
1560 } 1646 }
1561 } 1647 }
1562 }; 1648 };
1563} 1649}
1564 1650
… …
1992 2078
1993 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1994 () 2080 ()
1995} 2081}
1996 2082
2083# may re-bless or do other evil things
1997sub init { 2084sub init {
1998 my ($self) = @_; 2085 my ($self) = @_;
1999 2086
2000 $self 2087 $self
2001} 2088}
… …
2066 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
2067 2154
2068 1 2155 1
2069} 2156}
2070 2157
2158# used to laod the header of an original map
2071sub load_header_orig { 2159sub load_header_orig {
2072 my ($self) = @_; 2160 my ($self) = @_;
2073 2161
2074 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2075} 2163}
2076 2164
2165# used to laod the header of an instantiated map
2077sub load_header_temp { 2166sub load_header_temp {
2078 my ($self) = @_; 2167 my ($self) = @_;
2079 2168
2080 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2081} 2170}
2082 2171
2172# called after loading the header from an instantiated map
2083sub prepare_temp { 2173sub prepare_temp {
2084 my ($self) = @_; 2174 my ($self) = @_;
2085 2175
2086 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2087 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2088 # safety 2178 # safety
2089 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2090 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2091} 2181}
2092 2182
2183# called after loading the header from an original map
2093sub prepare_orig { 2184sub prepare_orig {
2094 my ($self) = @_; 2185 my ($self) = @_;
2095 2186
2096 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2097 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2123sub find { 2214sub find {
2124 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2125 2216
2126 cf::cede_to_tick; 2217 cf::cede_to_tick;
2127 2218
2128 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2129 2220
2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2131 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2132 2223
2133 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2164 2255
2165 { 2256 {
2166 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2167 2258
2168 return unless $self->valid; 2259 return unless $self->valid;
2169 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2170
2171 $self->in_memory (cf::MAP_LOADING);
2172 2261
2173 $self->alloc; 2262 $self->alloc;
2174 2263
2175 $self->pre_load; 2264 $self->pre_load;
2176 cf::cede_to_tick; 2265 cf::cede_to_tick;
2177 2266
2267 if (exists $self->{load_path}) {
2178 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2179 $f->skip_block; 2269 $f->skip_block;
2180 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2181 or return; 2271 or return;
2182 2272
2183 $self->post_load_original 2273 $self->post_load_original
2184 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2185 2275
2186 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2187 utf8::encode $uniq; 2277 utf8::encode $uniq;
2188 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2189 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2190 $self->clear_unique_items; 2280 $self->clear_unique_items;
2191 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2192 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2193 } 2284 }
2194 } 2285 }
2195 }
2196 2286
2197 $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);
2198 2294
2199 cf::cede_to_tick; 2295 cf::cede_to_tick;
2200 # now do the right thing for maps 2296 # now do the right thing for maps
2201 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2202 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2206 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2207 $self->decay_objects; 2303 $self->decay_objects;
2208 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2209 $self->update_buttons; 2305 $self->update_buttons;
2210 cf::cede_to_tick; 2306 cf::cede_to_tick;
2211 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2212 } 2308 }
2213 2309
2214 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2215 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2216
2217 $self->in_memory (cf::MAP_ACTIVE);
2218 } 2312 }
2219 2313
2220 $self->post_load; 2314 $self->post_load;
2221 2315
2222 1 2316 1
… …
2235# if $self->per_party; 2329# if $self->per_party;
2236 2330
2237 $self 2331 $self
2238} 2332}
2239 2333
2240# find and load all maps in the 3x3 area around a map
2241sub load_neighbours {
2242 my ($map) = @_;
2243
2244 my @neigh; # diagonal neighbours
2245
2246 for (0 .. 3) {
2247 my $neigh = $map->tile_path ($_)
2248 or next;
2249 $neigh = find $neigh, $map
2250 or next;
2251 $neigh->load;
2252
2253 # now find the diagonal neighbours
2254 push @neigh,
2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2257 }
2258
2259 for (grep defined $_->[0], @neigh) {
2260 my ($path, $origin) = @$_;
2261 my $neigh = find $path, $origin
2262 or next;
2263 $neigh->load;
2264 }
2265}
2266
2267sub find_sync { 2334sub find_sync {
2268 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2269 2336
2337 # it's a bug to call this from the main context
2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2272 2340
2273 find $path, $origin 2341 find $path, $origin
2274} 2342}
2275 2343
2276sub do_load_sync { 2344sub do_load_sync {
2277 my ($map) = @_; 2345 my ($map) = @_;
2278 2346
2347 # it's a bug to call this from the main context
2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2280 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2281 2350
2282 $map->load; 2351 $map->load;
2283} 2352}
… …
2286our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2287 2356
2288sub find_async { 2357sub find_async {
2289 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2290 2359
2291 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2292 2361
2293 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2294 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2295 } 2364 }
2296 2365
2297 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2298 2367
2299 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2358sub swap_out { 2427sub swap_out {
2359 my ($self) = @_; 2428 my ($self) = @_;
2360 2429
2361 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2362 2431
2363 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2364 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2365 return if $self->players; 2434 return if $self->players;
2366 2435
2367 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate; 2437 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2370 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2371 2440
2372 # then atomically save 2441 # then atomically save
2373 $self->_save; 2442 $self->_save;
2374 2443
2375 # then free the map 2444 # then free the map
… …
2401 2470
2402 return if $self->players; 2471 return if $self->players;
2403 2472
2404 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2405 2474
2406 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2407 2476
2408 # need to save uniques path 2477 # need to save uniques path
2409 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411 2480
… …
2741 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2742 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2743 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2744 2813
2745 $map->load; 2814 $map->load;
2746 $map->load_neighbours;
2747 2815
2748 return unless $self->contr->active; 2816 return unless $self->contr->active;
2749 2817
2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2751 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2807 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2808 } 2876 }
2809 } 2877 }
2810 2878
2811 my $map = eval { 2879 my $map = eval {
2812 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2813 2881
2814 if ($map) { 2882 if ($map) {
2815 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2816 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2817 } else { 2885 } else {
… …
2907 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2908 2976
2909 unless (eval { 2977 unless (eval {
2910 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2911 2979
2912 # random map handling
2913 {
2914 my $guard = cf::lock_acquire "exit_prepare:$exit";
2915
2916 prepare_random_map $exit
2917 if $exit->slaying eq "/!";
2918 }
2919
2920 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2921 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2922 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 }
2923 3006
2924 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2925 3008
2926 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2927 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3152=cut 3235=cut
3153 3236
3154sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3155 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3156 3239
3157 if ($self->extcmd == 2) {
3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3159 } elsif ($self->extcmd == 1) { # TODO: remove
3160 push @msg, msgtype => "event_$type";
3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3162 }
3163} 3241}
3164 3242
3165=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3166 3244
3167Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3169=cut 3247=cut
3170 3248
3171sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3172 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3173 3251
3174 if ($self->extcmd == 2) {
3175 $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]));
3176 } elsif ($self->extcmd == 1) {
3177 #TODO: version 1, remove
3178 unshift @msg, msgtype => "reply", msgid => $id;
3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3180 }
3181} 3253}
3182 3254
3183=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3184 3256
3185Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3240 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3241 3313
3242 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3243 3315
3244 if (ref $msg) { 3316 if (ref $msg) {
3245 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3246 "ARRAY" eq ref $msg
3247 ? @$msg
3248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3249 3318
3250 my @reply; 3319 my @reply;
3251 3320
3252 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3253 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3431=cut 3500=cut
3432 3501
3433############################################################################# 3502#############################################################################
3434# the server's init and main functions 3503# the server's init and main functions
3435 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
3436sub load_facedata($) { 3529sub load_facedata($) {
3437 my ($path) = @_; 3530 my ($path) = @_;
3438 3531
3439 # 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
3440 # for this (global event?) 3533 # for this (global event?)
… …
3447 my $facedata = decode_storable load_file $path; 3540 my $facedata = decode_storable load_file $path;
3448 3541
3449 $facedata->{version} == 2 3542 $facedata->{version} == 2
3450 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3451 3544
3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3454 $facedata->{resource}{"res/exp_table"} = {
3455 type => FT_RSRC,
3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3458 };
3459 cf::cede_to_tick; 3545 cf::cede_to_tick;
3460 3546
3461 { 3547 {
3462 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3463 3549
3464 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3465 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3466 3553
3467 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3468 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3472 3560
3473 cf::cede_to_tick; 3561 cf::cede_to_tick;
3474 } 3562 }
3475 3563
3476 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3503 3591
3504 { 3592 {
3505 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3506 3594
3507 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3508 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
3509 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3510 3599
3600 cf::face::set_type $idx, $type;
3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3512 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#
3513 } else { 3604 } else {
3514 $RESOURCE{$name} = $info; # unused 3605# $RESOURCE{$name} = $info; # unused
3515 } 3606 }
3516 3607
3517 cf::cede_to_tick; 3608 cf::cede_to_tick;
3518 } 3609 }
3519 } 3610 }
… …
3537 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3538 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3539 cf::arch::commit_load; 3630 cf::arch::commit_load;
3540 3631
3541 $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;
3542} 3646}
3543 3647
3544sub reload_regions { 3648sub reload_regions {
3545 # 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
3546 # for this (global event?) 3650 # for this (global event?)
… …
3561} 3665}
3562 3666
3563sub reload_archetypes { 3667sub reload_archetypes {
3564 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3565 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 );
3566} 3679}
3567 3680
3568sub reload_treasures { 3681sub reload_treasures {
3569 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3570 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
… …
3588 my $face = cf::face::find "sound/$v"; 3701 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face; 3702 cf::sound::set $k => $face;
3590 } 3703 }
3591} 3704}
3592 3705
3706#d# move docstuff to help or so
3707our %DOCSTRING;
3708
3709sub reload_pod {
3710 trace "loading pods $PODDIR\n";
3711
3712 %DOCSTRING = ();
3713 my @command_list;
3714
3715 for (
3716 [0, "command_help"],
3717 [1, "emote_help"],
3718 [2, "dmcommand_help"],
3719 ) {
3720 my ($type, $path) = @$_;
3721
3722 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3723 or die "unable to load $path";
3724
3725 my $level = 1e9;
3726 my $rpar;
3727
3728 for my $par (@$paragraphs) {
3729 if ($par->{type} eq "head2") {
3730 # this code taken almost verbatim from DC/Protocol.pm
3731
3732 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3733 my $cmd = $1;
3734 my @args = split /\|/, $2;
3735 @args = (".*") unless @args;
3736
3737 $_ = $_ eq ".*" ? "" : " $_"
3738 for @args;
3739
3740 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3741
3742 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3743
3744 push @command_list, [$type, \@variants];
3745 $level = $par->{level};
3746 } else {
3747 error "$par->{markup}: unparsable command heading";
3748 }
3749 } elsif ($par->{level} > $level) {
3750 $$rpar .= &cf::pod::as_cfpod ([$par]);
3751 }
3752
3753 cf::cede_to_tick;
3754 }
3755 }
3756
3757 @command_list = sort {
3758 $a->[0] <=> $b->[0]
3759 or $a->[1] cmp $b->[1]
3760 } @command_list;
3761
3762 cf::cede_to_tick;
3763
3764 add_face "res/command_list" => FT_RSRC,
3765 JSON::XS->new->utf8->encode (\@command_list);
3766}
3767
3593sub reload_resources { 3768sub reload_resources {
3594 trace "reloading resource files...\n"; 3769 trace "reloading resource files...\n";
3595 3770
3596 reload_exp_table;
3597 reload_materials; 3771 reload_materials;
3598 reload_facedata; 3772 reload_facedata;
3773 reload_exp_table;
3599 reload_sound; 3774 reload_sound;
3600 reload_archetypes; 3775 reload_archetypes;
3601 reload_regions; 3776 reload_regions;
3602 reload_treasures; 3777 reload_treasures;
3778 reload_pod;
3603 3779
3604 trace "finished reloading resource files\n"; 3780 trace "finished reloading resource files\n";
3605} 3781}
3606 3782
3607sub reload_config { 3783sub reload_config {
… …
3655 3831
3656sub main { 3832sub main {
3657 cf::init_globals; # initialise logging 3833 cf::init_globals; # initialise logging
3658 3834
3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3835 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3836 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3837 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3838 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3663 3839
3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3840 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3665 3841
3666 # we must not ever block the main coroutine 3842 # we must not ever block the main coroutine
3667 local $Coro::idle = sub { 3843 $Coro::idle = sub {
3668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3844 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3669 (async { 3845 (async {
3670 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3846 $Coro::current->{desc} = "IDLE BUG HANDLER";
3671 EV::loop EV::LOOP_ONESHOT; 3847 EV::loop EV::LOOP_ONESHOT;
3672 })->prio (Coro::PRIO_MAX); 3848 })->prio (Coro::PRIO_MAX);
… …
3675 evthread_start IO::AIO::poll_fileno; 3851 evthread_start IO::AIO::poll_fileno;
3676 3852
3677 cf::sync_job { 3853 cf::sync_job {
3678 cf::incloader::init (); 3854 cf::incloader::init ();
3679 3855
3856 db_init;
3857
3680 cf::init_anim; 3858 cf::init_anim;
3681 cf::init_attackmess; 3859 cf::init_attackmess;
3682 cf::init_dynamic; 3860 cf::init_dynamic;
3683 3861
3684 cf::load_settings; 3862 cf::load_settings;
3685 3863
3686 reload_resources; 3864 reload_resources;
3687 reload_config; 3865 reload_config;
3688 db_init;
3689 3866
3690 cf::init_uuid; 3867 cf::init_uuid;
3691 cf::init_signals; 3868 cf::init_signals;
3692 cf::init_skills; 3869 cf::init_skills;
3693 3870
… …
3707 }; 3884 };
3708 3885
3709 cf::object::thawer::errors_are_fatal 0; 3886 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n"; 3887 info "parse errors in files are no longer fatal from this point on.\n";
3711 3888
3712 my $free_main; $free_main = EV::idle sub { 3889 AE::postpone {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :) 3890 undef &main; # free gobs of memory :)
3715 }; 3891 };
3716 3892
3717 goto &main_loop; 3893 goto &main_loop;
3718} 3894}
… …
3875 4051
3876 cf::write_runtime_sync; # external watchdog should not bark 4052 cf::write_runtime_sync; # external watchdog should not bark
3877 4053
3878 trace "emergency_perl_save: flushing outstanding aio requests"; 4054 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) { 4055 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4056 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3881 } 4057 }
3882 4058
3883 cf::write_runtime_sync; # external watchdog should not bark 4059 cf::write_runtime_sync; # external watchdog should not bark
3884 }; 4060 };
3885 4061
… …
4066 4242
4067############################################################################# 4243#############################################################################
4068 4244
4069my $bug_warning = 0; 4245my $bug_warning = 0;
4070 4246
4071our @WAIT_FOR_TICK;
4072our @WAIT_FOR_TICK_BEGIN;
4073
4074sub wait_for_tick() { 4247sub wait_for_tick() {
4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4248 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4076 4249
4077 my $signal = new Coro::Signal; 4250 $WAIT_FOR_TICK->wait;
4078 push @WAIT_FOR_TICK, $signal;
4079 $signal->wait;
4080} 4251}
4081 4252
4082sub wait_for_tick_begin() { 4253sub wait_for_tick_begin() {
4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4254 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4084 4255
4085 my $signal = new Coro::Signal; 4256 my $signal = new Coro::Signal;
4086 push @WAIT_FOR_TICK_BEGIN, $signal; 4257 push @WAIT_FOR_TICK_BEGIN, $signal;
4087 $signal->wait; 4258 $signal->wait;
4088} 4259}
… …
4092 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4263 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4093 unless ++$bug_warning > 10; 4264 unless ++$bug_warning > 10;
4094 return; 4265 return;
4095 } 4266 }
4096 4267
4097 cf::server_tick; # one server iteration 4268 cf::one_tick; # one server iteration
4098 4269
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4270 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100 4271
4101 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4272 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4273 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4108 } 4279 }
4109 4280
4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4281 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4111 $sig->send; 4282 $sig->send;
4112 } 4283 }
4113 while (my $sig = shift @WAIT_FOR_TICK) { 4284 $WAIT_FOR_TICK->broadcast;
4114 $sig->send;
4115 }
4116 4285
4117 $LOAD = ($NOW - $TICK_START) / $TICK; 4286 $LOAD = ($NOW - $TICK_START) / $TICK;
4118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4287 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4119 4288
4120 if (0) { 4289 if (0) {
… …
4126 } 4295 }
4127} 4296}
4128 4297
4129{ 4298{
4130 # configure BDB 4299 # configure BDB
4300 info "initialising database";
4131 4301
4132 BDB::min_parallel 16; 4302 BDB::min_parallel 16;
4133 BDB::max_poll_reqs $TICK * 0.1; 4303 BDB::max_poll_reqs $TICK * 0.1;
4134 $AnyEvent::BDB::WATCHER->priority (1); 4304 #$AnyEvent::BDB::WATCHER->priority (1);
4135 4305
4136 unless ($DB_ENV) { 4306 unless ($DB_ENV) {
4137 $DB_ENV = BDB::db_env_create; 4307 $DB_ENV = BDB::db_env_create;
4138 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4308 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4139 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4309 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4164 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4334 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4165 }; 4335 };
4166 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4336 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4167 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4337 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4168 }; 4338 };
4339
4340 info "database initialised";
4169} 4341}
4170 4342
4171{ 4343{
4172 # configure IO::AIO 4344 # configure IO::AIO
4173 4345
4346 info "initialising aio";
4174 IO::AIO::min_parallel 8; 4347 IO::AIO::min_parallel 8;
4175 IO::AIO::max_poll_time $TICK * 0.1; 4348 IO::AIO::max_poll_time $TICK * 0.1;
4176 undef $AnyEvent::AIO::WATCHER; 4349 undef $AnyEvent::AIO::WATCHER;
4350 info "aio initialised";
4177} 4351}
4178 4352
4179our $_log_backtrace; 4353our $_log_backtrace;
4180our $_log_backtrace_last; 4354our $_log_backtrace_last;
4181 4355

Diff Legend

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