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.586 by root, Wed Oct 31 15:02:02 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
… …
108our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 112
113our %RESOURCE; # unused 113#our %RESOURCE; # unused
114 114
115our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
117 117
118our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
129our $DB_ENV; 129our $DB_ENV;
130 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 132
133our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 135
135our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
137our $NOW; 139our $NOW;
138 140
139our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
… …
150 152
151our @POST_INIT; 153our @POST_INIT;
152 154
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
155 160
156binmode STDOUT; 161binmode STDOUT;
157binmode STDERR; 162binmode STDERR;
158 163
159# read virtual server time, if available 164# read virtual server time, if available
… …
193 198
194=over 4 199=over 4
195 200
196=item $cf::UPTIME 201=item $cf::UPTIME
197 202
198The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
199 219
200=item $cf::RUNTIME 220=item $cf::RUNTIME
201 221
202The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 223every server tick.
… …
209Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
212database environment. 232database environment.
213 233
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 234=item $cf::LOADAVG
223 235
224The current CPU load on the server (alpha-smoothed), as a value between 0 236The 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 237(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
238 250
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These 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 252returns 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. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
242 266
243=cut 267=cut
244 268
245sub wait_for_tick(); 269sub wait_for_tick();
246sub wait_for_tick_begin(); 270sub wait_for_tick_begin();
… …
312)) { 336)) {
313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314} 338}
315 339
316$EV::DIED = sub { 340$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 341 warn "error in event callback: $@";
318}; 342};
319 343
320############################################################################# 344#############################################################################
321 345
322sub fork_call(&@); 346sub fork_call(&@);
… …
349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350 $d 374 $d
351 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
352} 376}
353 377
354=item $scalar = load_file $path 378=item $scalar = cf::load_file $path
355 379
356Loads the given file from path and returns its contents. Croaks on error 380Loads the given file from path and returns its contents. Croaks on error
357and can block. 381and can block.
358 382
359=cut 383=cut
… …
361sub load_file($) { 385sub load_file($) {
362 0 <= aio_load $_[0], my $data 386 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 387 or Carp::croak "$_[0]: $!";
364 388
365 $data 389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
366} 428}
367 429
368=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
369 431
370Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
… …
545 } 607 }
546 } 608 }
547 609
548 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 613 } else {
553 $busy = 0; 614 $busy = 0;
554 Coro::schedule; 615 Coro::schedule;
555 } 616 }
556 } 617 }
… …
1439 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1440 1501
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1503
1443 if (ref $msg) { 1504 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1505 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 1506
1449 my @reply; 1507 my @reply;
1450 1508
1451 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
… …
1474 }; 1532 };
1475 1533
1476 $grp 1534 $grp
1477} 1535}
1478 1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1479sub load_extensions { 1548sub load_extensions {
1480 info "loading extensions..."; 1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1481 1552
1482 cf::sync_job { 1553 cf::sync_job {
1483 my %todo; 1554 my %todo;
1484 1555
1485 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
… …
1528 unless exists $done{$_}; 1599 unless exists $done{$_};
1529 } 1600 }
1530 1601
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 1603
1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1533 my $active = eval $v->{source}; 1613 my $active = eval $source;
1534 1614
1535 if (length $@) { 1615 if (length $@) {
1536 error "$v->{path}: $@\n"; 1616 error "$v->{path}: $@\n";
1537 1617
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1555 1635
1556 while (my ($k, $v) = each %todo) { 1636 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory}; 1638 if exists $v->{meta}{mandatory};
1559 } 1639 }
1640
1641 last;
1560 } 1642 }
1561 } 1643 }
1562 }; 1644 };
1563} 1645}
1564 1646
… …
1992 2074
1993 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1994 () 2076 ()
1995} 2077}
1996 2078
2079# may re-bless or do other evil things
1997sub init { 2080sub init {
1998 my ($self) = @_; 2081 my ($self) = @_;
1999 2082
2000 $self 2083 $self
2001} 2084}
… …
2066 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
2067 2150
2068 1 2151 1
2069} 2152}
2070 2153
2154# used to laod the header of an original map
2071sub load_header_orig { 2155sub load_header_orig {
2072 my ($self) = @_; 2156 my ($self) = @_;
2073 2157
2074 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
2075} 2159}
2076 2160
2161# used to laod the header of an instantiated map
2077sub load_header_temp { 2162sub load_header_temp {
2078 my ($self) = @_; 2163 my ($self) = @_;
2079 2164
2080 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
2081} 2166}
2082 2167
2168# called after loading the header from an instantiated map
2083sub prepare_temp { 2169sub prepare_temp {
2084 my ($self) = @_; 2170 my ($self) = @_;
2085 2171
2086 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
2087 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
2088 # safety 2174 # safety
2089 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
2090 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
2091} 2177}
2092 2178
2179# called after loading the header from an original map
2093sub prepare_orig { 2180sub prepare_orig {
2094 my ($self) = @_; 2181 my ($self) = @_;
2095 2182
2096 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2097 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
… …
2123sub find { 2210sub find {
2124 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2125 2212
2126 cf::cede_to_tick; 2213 cf::cede_to_tick;
2127 2214
2128 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2129 2216
2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2131 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2132 2219
2133 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
… …
2164 2251
2165 { 2252 {
2166 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2167 2254
2168 return unless $self->valid; 2255 return unless $self->valid;
2169 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2170
2171 $self->in_memory (cf::MAP_LOADING);
2172 2257
2173 $self->alloc; 2258 $self->alloc;
2174 2259
2175 $self->pre_load; 2260 $self->pre_load;
2176 cf::cede_to_tick; 2261 cf::cede_to_tick;
2177 2262
2263 if (exists $self->{load_path}) {
2178 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2179 $f->skip_block; 2265 $f->skip_block;
2180 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2181 or return; 2267 or return;
2182 2268
2183 $self->post_load_original 2269 $self->post_load_original
2184 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2185 2271
2186 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2187 utf8::encode $uniq; 2273 utf8::encode $uniq;
2188 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2189 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2190 $self->clear_unique_items; 2276 $self->clear_unique_items;
2191 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2192 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2193 } 2280 }
2194 } 2281 }
2195 }
2196 2282
2197 $f->resolve_delayed_derefs; 2283 $f->resolve_delayed_derefs;
2284 } else {
2285 $self->post_load_original
2286 if delete $self->{load_original};
2287 }
2288
2289 $self->state (cf::MAP_INACTIVE);
2198 2290
2199 cf::cede_to_tick; 2291 cf::cede_to_tick;
2200 # now do the right thing for maps 2292 # now do the right thing for maps
2201 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2202 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
… …
2206 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2207 $self->decay_objects; 2299 $self->decay_objects;
2208 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2209 $self->update_buttons; 2301 $self->update_buttons;
2210 cf::cede_to_tick; 2302 cf::cede_to_tick;
2211 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2212 } 2304 }
2213 2305
2214 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2215 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2216
2217 $self->in_memory (cf::MAP_ACTIVE);
2218 } 2308 }
2219 2309
2220 $self->post_load; 2310 $self->post_load;
2221 2311
2222 1 2312 1
… …
2235# if $self->per_party; 2325# if $self->per_party;
2236 2326
2237 $self 2327 $self
2238} 2328}
2239 2329
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 { 2330sub find_sync {
2268 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2269 2332
2333 # it's a bug to call this from the main context
2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main; 2335 if $Coro::current == $Coro::main;
2272 2336
2273 find $path, $origin 2337 find $path, $origin
2274} 2338}
2275 2339
2276sub do_load_sync { 2340sub do_load_sync {
2277 my ($map) = @_; 2341 my ($map) = @_;
2278 2342
2343 # it's a bug to call this from the main context
2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2280 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2281 2346
2282 $map->load; 2347 $map->load;
2283} 2348}
… …
2286our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2287 2352
2288sub find_async { 2353sub find_async {
2289 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2290 2355
2291 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2292 2357
2293 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2294 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2295 } 2360 }
2296 2361
2297 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2298 2363
2299 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
… …
2358sub swap_out { 2423sub swap_out {
2359 my ($self) = @_; 2424 my ($self) = @_;
2360 2425
2361 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2362 2427
2363 return if $self->in_memory != cf::MAP_ACTIVE; 2428 return if !$self->linkable;
2364 return if $self->{deny_save}; 2429 return if $self->{deny_save};
2365 return if $self->players; 2430 return if $self->players;
2366 2431
2367 # first deactivate the map and "unlink" it from the core 2432 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate; 2433 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP; 2434 $_->clear_links_to ($self) for values %cf::MAP;
2370 $self->in_memory (cf::MAP_SWAPPED); 2435 $self->state (cf::MAP_SWAPPED);
2371 2436
2372 # then atomically save 2437 # then atomically save
2373 $self->_save; 2438 $self->_save;
2374 2439
2375 # then free the map 2440 # then free the map
… …
2401 2466
2402 return if $self->players; 2467 return if $self->players;
2403 2468
2404 cf::trace "resetting map ", $self->path, "\n"; 2469 cf::trace "resetting map ", $self->path, "\n";
2405 2470
2406 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2407 2472
2408 # need to save uniques path 2473 # need to save uniques path
2409 unless ($self->{deny_save}) { 2474 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq; 2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411 2476
… …
2741 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2742 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2743 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2744 2809
2745 $map->load; 2810 $map->load;
2746 $map->load_neighbours;
2747 2811
2748 return unless $self->contr->active; 2812 return unless $self->contr->active;
2749 2813
2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2751 if ($self->enter_map ($map, $x, $y)) { 2815 if ($self->enter_map ($map, $x, $y)) {
… …
2807 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2808 } 2872 }
2809 } 2873 }
2810 2874
2811 my $map = eval { 2875 my $map = eval {
2812 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2813 2877
2814 if ($map) { 2878 if ($map) {
2815 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2816 $map = $check->($map, $x, $y, $self) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2817 } else { 2881 } else {
… …
2907 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2908 2972
2909 unless (eval { 2973 unless (eval {
2910 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2911 2975
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; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2921 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2922 my $y = $exit->stats->sp; 2978 my $y = $exit->stats->sp;
2979
2980 # special map handling
2981 my $slaying = $exit->slaying;
2982
2983 # special map handling
2984 if ($slaying eq "/!") {
2985 my $guard = cf::lock_acquire "exit_prepare:$exit";
2986
2987 prepare_random_map $exit
2988 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2989
2990 $map = $exit->slaying;
2991
2992 } elsif ($slaying eq '!up') {
2993 $map = $exit->map->tile_path (cf::TILE_UP);
2994 $x = $exit->x;
2995 $y = $exit->y;
2996
2997 } elsif ($slaying eq '!down') {
2998 $map = $exit->map->tile_path (cf::TILE_DOWN);
2999 $x = $exit->x;
3000 $y = $exit->y;
3001 }
2923 3002
2924 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2925 3004
2926 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2927 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
… …
3169=cut 3248=cut
3170 3249
3171sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3172 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3173 3252
3174 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $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} 3256}
3182 3257
3183=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3184 3259
3185Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
… …
3240 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3241 3316
3242 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3243 3318
3244 if (ref $msg) { 3319 if (ref $msg) {
3245 my ($type, $reply, @payload) = 3320 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 3321
3250 my @reply; 3322 my @reply;
3251 3323
3252 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3253 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
… …
3431=cut 3503=cut
3432 3504
3433############################################################################# 3505#############################################################################
3434# the server's init and main functions 3506# the server's init and main functions
3435 3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3509
3436sub load_facedata($) { 3510sub load_facedata($) {
3437 my ($path) = @_; 3511 my ($path) = @_;
3438 3512
3439 # HACK to clear player env face cache, we need some signal framework 3513 # HACK to clear player env face cache, we need some signal framework
3440 # for this (global event?) 3514 # for this (global event?)
… …
3459 cf::cede_to_tick; 3533 cf::cede_to_tick;
3460 3534
3461 { 3535 {
3462 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3463 3537
3464 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3465 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3466 3541
3467 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3468 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3545 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3546 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3547 $FACEHASH{$info->{hash64}} = $idx;#d#
3472 3548
3473 cf::cede_to_tick; 3549 cf::cede_to_tick;
3474 } 3550 }
3475 3551
3476 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
… …
3503 3579
3504 { 3580 {
3505 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3506 3582
3507 while (my ($name, $info) = each %$res) { 3583 while (my ($name, $info) = each %$res) {
3508 if (defined $info->{type}) { 3584 if (defined (my $type = $info->{type})) {
3585 # 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; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3510 3587
3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3512 cf::face::set_type $idx, $info->{type}; 3589 cf::face::set_type $idx, $type;
3590 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3591 $FACEHASH{$info->{hash}} = $idx;#d#
3513 } else { 3592 } else {
3514 $RESOURCE{$name} = $info; # unused 3593# $RESOURCE{$name} = $info; # unused
3515 } 3594 }
3516 3595
3517 cf::cede_to_tick; 3596 cf::cede_to_tick;
3518 } 3597 }
3519 } 3598 }
… …
3655 3734
3656sub main { 3735sub main {
3657 cf::init_globals; # initialise logging 3736 cf::init_globals; # initialise logging
3658 3737
3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3738 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3739 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3740 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3663 3742
3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3743 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3665 3744
… …
3707 }; 3786 };
3708 3787
3709 cf::object::thawer::errors_are_fatal 0; 3788 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n"; 3789 info "parse errors in files are no longer fatal from this point on.\n";
3711 3790
3712 my $free_main; $free_main = EV::idle sub { 3791 AE::postpone {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :) 3792 undef &main; # free gobs of memory :)
3715 }; 3793 };
3716 3794
3717 goto &main_loop; 3795 goto &main_loop;
3718} 3796}
… …
3875 3953
3876 cf::write_runtime_sync; # external watchdog should not bark 3954 cf::write_runtime_sync; # external watchdog should not bark
3877 3955
3878 trace "emergency_perl_save: flushing outstanding aio requests"; 3956 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) { 3957 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3958 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3881 } 3959 }
3882 3960
3883 cf::write_runtime_sync; # external watchdog should not bark 3961 cf::write_runtime_sync; # external watchdog should not bark
3884 }; 3962 };
3885 3963
… …
4066 4144
4067############################################################################# 4145#############################################################################
4068 4146
4069my $bug_warning = 0; 4147my $bug_warning = 0;
4070 4148
4071our @WAIT_FOR_TICK;
4072our @WAIT_FOR_TICK_BEGIN;
4073
4074sub wait_for_tick() { 4149sub wait_for_tick() {
4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4076 4151
4077 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
4078 push @WAIT_FOR_TICK, $signal;
4079 $signal->wait;
4080} 4153}
4081 4154
4082sub wait_for_tick_begin() { 4155sub wait_for_tick_begin() {
4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4084 4157
4085 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
4086 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
4087 $signal->wait; 4160 $signal->wait;
4088} 4161}
… …
4092 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4165 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4093 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
4094 return; 4167 return;
4095 } 4168 }
4096 4169
4097 cf::server_tick; # one server iteration 4170 cf::one_tick; # one server iteration
4098 4171
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4172 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100 4173
4101 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4175 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4108 } 4181 }
4109 4182
4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4111 $sig->send; 4184 $sig->send;
4112 } 4185 }
4113 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
4114 $sig->send;
4115 }
4116 4187
4117 $LOAD = ($NOW - $TICK_START) / $TICK; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
4118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4119 4190
4120 if (0) { 4191 if (0) {
… …
4129{ 4200{
4130 # configure BDB 4201 # configure BDB
4131 4202
4132 BDB::min_parallel 16; 4203 BDB::min_parallel 16;
4133 BDB::max_poll_reqs $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
4134 $AnyEvent::BDB::WATCHER->priority (1); 4205 #$AnyEvent::BDB::WATCHER->priority (1);
4135 4206
4136 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
4137 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
4138 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4139 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4210 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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