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.563 by root, Sat Apr 23 04:56:51 2011 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,2011 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.
… …
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."
… …
2069 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
2070 2154
2071 1 2155 1
2072} 2156}
2073 2157
2158# used to laod the header of an original map
2074sub load_header_orig { 2159sub load_header_orig {
2075 my ($self) = @_; 2160 my ($self) = @_;
2076 2161
2077 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2078} 2163}
2079 2164
2165# used to laod the header of an instantiated map
2080sub load_header_temp { 2166sub load_header_temp {
2081 my ($self) = @_; 2167 my ($self) = @_;
2082 2168
2083 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2084} 2170}
2085 2171
2172# called after loading the header from an instantiated map
2086sub prepare_temp { 2173sub prepare_temp {
2087 my ($self) = @_; 2174 my ($self) = @_;
2088 2175
2089 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2090 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2091 # safety 2178 # safety
2092 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2093 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2094} 2181}
2095 2182
2183# called after loading the header from an original map
2096sub prepare_orig { 2184sub prepare_orig {
2097 my ($self) = @_; 2185 my ($self) = @_;
2098 2186
2099 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2100 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2126sub find { 2214sub find {
2127 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2128 2216
2129 cf::cede_to_tick; 2217 cf::cede_to_tick;
2130 2218
2131 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2132 2220
2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2135 2223
2136 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2167 2255
2168 { 2256 {
2169 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2170 2258
2171 return unless $self->valid; 2259 return unless $self->valid;
2172 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2173
2174 $self->in_memory (cf::MAP_LOADING);
2175 2261
2176 $self->alloc; 2262 $self->alloc;
2177 2263
2178 $self->pre_load; 2264 $self->pre_load;
2179 cf::cede_to_tick; 2265 cf::cede_to_tick;
… …
2197 } 2283 }
2198 } 2284 }
2199 } 2285 }
2200 2286
2201 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2202 } 2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2203 2294
2204 cf::cede_to_tick; 2295 cf::cede_to_tick;
2205 # now do the right thing for maps 2296 # now do the right thing for maps
2206 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2207 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2211 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2212 $self->decay_objects; 2303 $self->decay_objects;
2213 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2214 $self->update_buttons; 2305 $self->update_buttons;
2215 cf::cede_to_tick; 2306 cf::cede_to_tick;
2216 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2217 } 2308 }
2218 2309
2219 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2220 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2221
2222 $self->in_memory (cf::MAP_ACTIVE);
2223 } 2312 }
2224 2313
2225 $self->post_load; 2314 $self->post_load;
2226 2315
2227 1 2316 1
… …
2240# if $self->per_party; 2329# if $self->per_party;
2241 2330
2242 $self 2331 $self
2243} 2332}
2244 2333
2245# find and load all maps in the 3x3 area around a map
2246sub load_neighbours {
2247 my ($map) = @_;
2248
2249 my @neigh; # diagonal neighbours
2250
2251 for (0 .. 3) {
2252 my $neigh = $map->tile_path ($_)
2253 or next;
2254 $neigh = find $neigh, $map
2255 or next;
2256 $neigh->load;
2257
2258 # now find the diagonal neighbours
2259 push @neigh,
2260 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2261 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2262 }
2263
2264 for (grep defined $_->[0], @neigh) {
2265 my ($path, $origin) = @$_;
2266 my $neigh = find $path, $origin
2267 or next;
2268 $neigh->load;
2269 }
2270}
2271
2272sub find_sync { 2334sub find_sync {
2273 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2274 2336
2337 # it's a bug to call this from the main context
2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2277 2340
2278 find $path, $origin 2341 find $path, $origin
2279} 2342}
2280 2343
2281sub do_load_sync { 2344sub do_load_sync {
2282 my ($map) = @_; 2345 my ($map) = @_;
2283 2346
2347 # it's a bug to call this from the main context
2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2285 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2286 2350
2287 $map->load; 2351 $map->load;
2288} 2352}
… …
2291our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2292 2356
2293sub find_async { 2357sub find_async {
2294 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2295 2359
2296 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2297 2361
2298 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2299 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2300 } 2364 }
2301 2365
2302 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2303 2367
2304 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2363sub swap_out { 2427sub swap_out {
2364 my ($self) = @_; 2428 my ($self) = @_;
2365 2429
2366 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2367 2431
2368 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2369 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2370 return if $self->players; 2434 return if $self->players;
2371 2435
2372 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate; 2437 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2375 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2376 2440
2377 # then atomically save 2441 # then atomically save
2378 $self->_save; 2442 $self->_save;
2379 2443
2380 # then free the map 2444 # then free the map
… …
2406 2470
2407 return if $self->players; 2471 return if $self->players;
2408 2472
2409 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2410 2474
2411 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2412 2476
2413 # need to save uniques path 2477 # need to save uniques path
2414 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2415 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2416 2480
… …
2746 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2747 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2748 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2749 2813
2750 $map->load; 2814 $map->load;
2751 $map->load_neighbours;
2752 2815
2753 return unless $self->contr->active; 2816 return unless $self->contr->active;
2754 2817
2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2756 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2812 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2813 } 2876 }
2814 } 2877 }
2815 2878
2816 my $map = eval { 2879 my $map = eval {
2817 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2818 2881
2819 if ($map) { 2882 if ($map) {
2820 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2821 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2822 } else { 2885 } else {
… …
2912 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2913 2976
2914 unless (eval { 2977 unless (eval {
2915 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2916 2979
2917 # random map handling
2918 {
2919 my $guard = cf::lock_acquire "exit_prepare:$exit";
2920
2921 prepare_random_map $exit
2922 if $exit->slaying eq "/!";
2923 }
2924
2925 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2926 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2927 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 }
2928 3006
2929 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2930 3008
2931 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2932 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3157=cut 3235=cut
3158 3236
3159sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3160 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3161 3239
3162 if ($self->extcmd == 2) {
3163 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3164 } elsif ($self->extcmd == 1) { # TODO: remove
3165 push @msg, msgtype => "event_$type";
3166 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3167 }
3168} 3241}
3169 3242
3170=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3171 3244
3172Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3174=cut 3247=cut
3175 3248
3176sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3177 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3178 3251
3179 if ($self->extcmd == 2) {
3180 $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]));
3181 } elsif ($self->extcmd == 1) {
3182 #TODO: version 1, remove
3183 unshift @msg, msgtype => "reply", msgid => $id;
3184 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3185 }
3186} 3253}
3187 3254
3188=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3189 3256
3190Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3245 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3246 3313
3247 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3248 3315
3249 if (ref $msg) { 3316 if (ref $msg) {
3250 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3251 "ARRAY" eq ref $msg
3252 ? @$msg
3253 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3254 3318
3255 my @reply; 3319 my @reply;
3256 3320
3257 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3258 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3436=cut 3500=cut
3437 3501
3438############################################################################# 3502#############################################################################
3439# the server's init and main functions 3503# the server's init and main functions
3440 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
3441sub load_facedata($) { 3529sub load_facedata($) {
3442 my ($path) = @_; 3530 my ($path) = @_;
3443 3531
3444 # 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
3445 # for this (global event?) 3533 # for this (global event?)
… …
3452 my $facedata = decode_storable load_file $path; 3540 my $facedata = decode_storable load_file $path;
3453 3541
3454 $facedata->{version} == 2 3542 $facedata->{version} == 2
3455 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3456 3544
3457 # patch in the exptable
3458 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3459 $facedata->{resource}{"res/exp_table"} = {
3460 type => FT_RSRC,
3461 data => $exp_table,
3462 hash => (Digest::MD5::md5 $exp_table),
3463 };
3464 cf::cede_to_tick; 3545 cf::cede_to_tick;
3465 3546
3466 { 3547 {
3467 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3468 3549
3469 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3470 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3471 3553
3472 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3473 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3474 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3475 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3476 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#
3477 3560
3478 cf::cede_to_tick; 3561 cf::cede_to_tick;
3479 } 3562 }
3480 3563
3481 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3508 3591
3509 { 3592 {
3510 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3511 3594
3512 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3513 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
3514 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3515 3599
3600 cf::face::set_type $idx, $type;
3516 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3517 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#
3518 } else { 3604 } else {
3519 $RESOURCE{$name} = $info; # unused 3605# $RESOURCE{$name} = $info; # unused
3520 } 3606 }
3521 3607
3522 cf::cede_to_tick; 3608 cf::cede_to_tick;
3523 } 3609 }
3524 } 3610 }
… …
3542 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3543 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3544 cf::arch::commit_load; 3630 cf::arch::commit_load;
3545 3631
3546 $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;
3547} 3646}
3548 3647
3549sub reload_regions { 3648sub reload_regions {
3550 # 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
3551 # for this (global event?) 3650 # for this (global event?)
… …
3566} 3665}
3567 3666
3568sub reload_archetypes { 3667sub reload_archetypes {
3569 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3570 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 );
3571} 3679}
3572 3680
3573sub reload_treasures { 3681sub reload_treasures {
3574 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3575 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
… …
3596} 3704}
3597 3705
3598sub reload_resources { 3706sub reload_resources {
3599 trace "reloading resource files...\n"; 3707 trace "reloading resource files...\n";
3600 3708
3601 reload_exp_table;
3602 reload_materials; 3709 reload_materials;
3603 reload_facedata; 3710 reload_facedata;
3711 reload_exp_table;
3604 reload_sound; 3712 reload_sound;
3605 reload_archetypes; 3713 reload_archetypes;
3606 reload_regions; 3714 reload_regions;
3607 reload_treasures; 3715 reload_treasures;
3608 3716
… …
3660 3768
3661sub main { 3769sub main {
3662 cf::init_globals; # initialise logging 3770 cf::init_globals; # initialise logging
3663 3771
3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3772 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3773 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3774 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3775 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3668 3776
3669 $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
3670 3778
3671 # we must not ever block the main coroutine 3779 # we must not ever block the main coroutine
3672 local $Coro::idle = sub { 3780 $Coro::idle = sub {
3673 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#
3674 (async { 3782 (async {
3675 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3783 $Coro::current->{desc} = "IDLE BUG HANDLER";
3676 EV::loop EV::LOOP_ONESHOT; 3784 EV::loop EV::LOOP_ONESHOT;
3677 })->prio (Coro::PRIO_MAX); 3785 })->prio (Coro::PRIO_MAX);
… …
3712 }; 3820 };
3713 3821
3714 cf::object::thawer::errors_are_fatal 0; 3822 cf::object::thawer::errors_are_fatal 0;
3715 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";
3716 3824
3717 my $free_main; $free_main = EV::idle sub { 3825 AE::postpone {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :) 3826 undef &main; # free gobs of memory :)
3720 }; 3827 };
3721 3828
3722 goto &main_loop; 3829 goto &main_loop;
3723} 3830}
… …
3880 3987
3881 cf::write_runtime_sync; # external watchdog should not bark 3988 cf::write_runtime_sync; # external watchdog should not bark
3882 3989
3883 trace "emergency_perl_save: flushing outstanding aio requests"; 3990 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) { 3991 while (IO::AIO::nreqs || BDB::nreqs) {
3885 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
3886 } 3993 }
3887 3994
3888 cf::write_runtime_sync; # external watchdog should not bark 3995 cf::write_runtime_sync; # external watchdog should not bark
3889 }; 3996 };
3890 3997
… …
4071 4178
4072############################################################################# 4179#############################################################################
4073 4180
4074my $bug_warning = 0; 4181my $bug_warning = 0;
4075 4182
4076our @WAIT_FOR_TICK;
4077our @WAIT_FOR_TICK_BEGIN;
4078
4079sub wait_for_tick() { 4183sub wait_for_tick() {
4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4184 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4081 4185
4082 my $signal = new Coro::Signal; 4186 $WAIT_FOR_TICK->wait;
4083 push @WAIT_FOR_TICK, $signal;
4084 $signal->wait;
4085} 4187}
4086 4188
4087sub wait_for_tick_begin() { 4189sub wait_for_tick_begin() {
4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4190 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4089 4191
4090 my $signal = new Coro::Signal; 4192 my $signal = new Coro::Signal;
4091 push @WAIT_FOR_TICK_BEGIN, $signal; 4193 push @WAIT_FOR_TICK_BEGIN, $signal;
4092 $signal->wait; 4194 $signal->wait;
4093} 4195}
… …
4097 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"
4098 unless ++$bug_warning > 10; 4200 unless ++$bug_warning > 10;
4099 return; 4201 return;
4100 } 4202 }
4101 4203
4102 cf::server_tick; # one server iteration 4204 cf::one_tick; # one server iteration
4103 4205
4104 #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#
4105 4207
4106 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4208 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4107 $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.;
… …
4113 } 4215 }
4114 4216
4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4217 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4116 $sig->send; 4218 $sig->send;
4117 } 4219 }
4118 while (my $sig = shift @WAIT_FOR_TICK) { 4220 $WAIT_FOR_TICK->broadcast;
4119 $sig->send;
4120 }
4121 4221
4122 $LOAD = ($NOW - $TICK_START) / $TICK; 4222 $LOAD = ($NOW - $TICK_START) / $TICK;
4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4124 4224
4125 if (0) { 4225 if (0) {
… …
4134{ 4234{
4135 # configure BDB 4235 # configure BDB
4136 4236
4137 BDB::min_parallel 16; 4237 BDB::min_parallel 16;
4138 BDB::max_poll_reqs $TICK * 0.1; 4238 BDB::max_poll_reqs $TICK * 0.1;
4139 $AnyEvent::BDB::WATCHER->priority (1); 4239 #$AnyEvent::BDB::WATCHER->priority (1);
4140 4240
4141 unless ($DB_ENV) { 4241 unless ($DB_ENV) {
4142 $DB_ENV = BDB::db_env_create; 4242 $DB_ENV = BDB::db_env_create;
4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4243 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4144 $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