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.559 by root, Sat Feb 26 12:50:27 2011 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
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
… …
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 132
133our %CFG; 133our %CFG;
134 134
135our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
137our $NOW; 138our $NOW;
138 139
139our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
150 151
151our @POST_INIT; 152our @POST_INIT;
152 153
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
155 159
156binmode STDOUT; 160binmode STDOUT;
157binmode STDERR; 161binmode STDERR;
158 162
159# read virtual server time, if available 163# read virtual server time, if available
… …
193 197
194=over 4 198=over 4
195 199
196=item $cf::UPTIME 200=item $cf::UPTIME
197 201
198The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
199 218
200=item $cf::RUNTIME 219=item $cf::RUNTIME
201 220
202The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 222every server tick.
… …
209Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
212database environment. 231database environment.
213 232
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 233=item $cf::LOADAVG
223 234
224The current CPU load on the server (alpha-smoothed), as a value between 0 235The 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 236(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
238 249
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These 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 251returns 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. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
242 265
243=cut 266=cut
244 267
245sub wait_for_tick(); 268sub wait_for_tick();
246sub wait_for_tick_begin(); 269sub wait_for_tick_begin();
… …
314} 337}
315 338
316$EV::DIED = sub { 339$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
318}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
319 347
320############################################################################# 348#############################################################################
321 349
322=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
323 351
… …
344 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
345 $d 373 $d
346 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
347} 375}
348 376
377=item $scalar = cf::load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
349=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
350 430
351Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
352 432
353=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
… …
359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
360 440
361sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
362sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
363 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
364=item $ref = cf::yaml_load $scalar 452=item $ref = cf::decode_yaml $scalar
365 453
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367 455
368=cut 456=cut
369 457
370sub fork_call(&@); 458sub decode_yaml($) {
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_ 459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
374} 473}
375 474
376=item cf::post_init { BLOCK } 475=item cf::post_init { BLOCK }
377 476
378Execute the given codeblock, I<after> all extensions have been (re-)loaded, 477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
462 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
463} 562}
464 563
465=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
466 565
467Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
468This call blocks and returns only when you have at least C<$time> seconds 567(default: 0): This call blocks and returns only when you have at least
469of cpu time till the next tick. The slot is only valid till the next cede. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
470 573
471The optional C<$name> can be used to identify the job to run. It might be 574The optional C<$name> can be used to identify the job to run. It might be
472used for statistical purposes and should identify the same time-class. 575used for statistical purposes and should identify the same time-class.
473 576
474Useful for short background jobs. 577Useful for short background jobs.
… …
503 } 606 }
504 } 607 }
505 608
506 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
507 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
508 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
509 $signal->wait;
510 } else { 612 } else {
511 $busy = 0; 613 $busy = 0;
512 Coro::schedule; 614 Coro::schedule;
513 } 615 }
514 } 616 }
… …
769 871
770 my @data; 872 my @data;
771 my $md5; 873 my $md5;
772 874
773 for (0 .. $#$src) { 875 for (0 .. $#$src) {
774 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
775 or Carp::croak "$src->[$_]: $!";
776 } 877 }
777 878
778 # if processing is expensive, check 879 # if processing is expensive, check
779 # checksum first 880 # checksum first
780 if (1) { 881 if (1) {
… …
1398 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1399 1500
1400 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1401 1502
1402 if (ref $msg) { 1503 if (ref $msg) {
1403 my ($type, $reply, @payload) = 1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1404 "ARRAY" eq ref $msg
1405 ? @$msg
1406 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1407 1505
1408 my @reply; 1506 my @reply;
1409 1507
1410 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1411 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
… …
1514 1612
1515 while (my ($k, $v) = each %todo) { 1613 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory}; 1615 if exists $v->{meta}{mandatory};
1518 } 1616 }
1617
1618 last;
1519 } 1619 }
1520 } 1620 }
1521 }; 1621 };
1522} 1622}
1523 1623
… …
1951 2051
1952 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1953 () 2053 ()
1954} 2054}
1955 2055
2056# may re-bless or do other evil things
1956sub init { 2057sub init {
1957 my ($self) = @_; 2058 my ($self) = @_;
1958 2059
1959 $self 2060 $self
1960} 2061}
… …
2025 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
2026 2127
2027 1 2128 1
2028} 2129}
2029 2130
2131# used to laod the header of an original map
2030sub load_header_orig { 2132sub load_header_orig {
2031 my ($self) = @_; 2133 my ($self) = @_;
2032 2134
2033 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
2034} 2136}
2035 2137
2138# used to laod the header of an instantiated map
2036sub load_header_temp { 2139sub load_header_temp {
2037 my ($self) = @_; 2140 my ($self) = @_;
2038 2141
2039 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
2040} 2143}
2041 2144
2145# called after loading the header from an instantiated map
2042sub prepare_temp { 2146sub prepare_temp {
2043 my ($self) = @_; 2147 my ($self) = @_;
2044 2148
2045 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
2046 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
2047 # safety 2151 # safety
2048 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
2049 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
2050} 2154}
2051 2155
2156# called after loading the header from an original map
2052sub prepare_orig { 2157sub prepare_orig {
2053 my ($self) = @_; 2158 my ($self) = @_;
2054 2159
2055 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
2056 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
… …
2082sub find { 2187sub find {
2083 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
2084 2189
2085 cf::cede_to_tick; 2190 cf::cede_to_tick;
2086 2191
2087 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
2088 2193
2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2090 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
2091 2196
2092 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
… …
2123 2228
2124 { 2229 {
2125 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2126 2231
2127 return unless $self->valid; 2232 return unless $self->valid;
2128 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2129
2130 $self->in_memory (cf::MAP_LOADING);
2131 2234
2132 $self->alloc; 2235 $self->alloc;
2133 2236
2134 $self->pre_load; 2237 $self->pre_load;
2135 cf::cede_to_tick; 2238 cf::cede_to_tick;
2136 2239
2240 if (exists $self->{load_path}) {
2137 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2138 $f->skip_block; 2242 $f->skip_block;
2139 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2140 or return; 2244 or return;
2141 2245
2142 $self->post_load_original 2246 $self->post_load_original
2143 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2144 2248
2145 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2146 utf8::encode $uniq; 2250 utf8::encode $uniq;
2147 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2148 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2149 $self->clear_unique_items; 2253 $self->clear_unique_items;
2150 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2151 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2152 } 2257 }
2153 } 2258 }
2154 }
2155 2259
2156 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2157 2267
2158 cf::cede_to_tick; 2268 cf::cede_to_tick;
2159 # now do the right thing for maps 2269 # now do the right thing for maps
2160 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2161 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
… …
2165 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2166 $self->decay_objects; 2276 $self->decay_objects;
2167 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2168 $self->update_buttons; 2278 $self->update_buttons;
2169 cf::cede_to_tick; 2279 cf::cede_to_tick;
2170 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2171 } 2281 }
2172 2282
2173 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2174 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2175
2176 $self->in_memory (cf::MAP_ACTIVE);
2177 } 2285 }
2178 2286
2179 $self->post_load; 2287 $self->post_load;
2180 2288
2181 1 2289 1
… …
2194# if $self->per_party; 2302# if $self->per_party;
2195 2303
2196 $self 2304 $self
2197} 2305}
2198 2306
2199# find and load all maps in the 3x3 area around a map
2200sub load_neighbours {
2201 my ($map) = @_;
2202
2203 my @neigh; # diagonal neighbours
2204
2205 for (0 .. 3) {
2206 my $neigh = $map->tile_path ($_)
2207 or next;
2208 $neigh = find $neigh, $map
2209 or next;
2210 $neigh->load;
2211
2212 # now find the diagonal neighbours
2213 push @neigh,
2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2216 }
2217
2218 for (grep defined $_->[0], @neigh) {
2219 my ($path, $origin) = @$_;
2220 my $neigh = find $path, $origin
2221 or next;
2222 $neigh->load;
2223 }
2224}
2225
2226sub find_sync { 2307sub find_sync {
2227 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2228 2309
2310 # it's a bug to call this from the main context
2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main; 2312 if $Coro::current == $Coro::main;
2231 2313
2232 find $path, $origin 2314 find $path, $origin
2233} 2315}
2234 2316
2235sub do_load_sync { 2317sub do_load_sync {
2236 my ($map) = @_; 2318 my ($map) = @_;
2237 2319
2320 # it's a bug to call this from the main context
2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2239 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2240 2323
2241 $map->load; 2324 $map->load;
2242} 2325}
… …
2245our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2246 2329
2247sub find_async { 2330sub find_async {
2248 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2249 2332
2250 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2251 2334
2252 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2253 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2254 } 2337 }
2255 2338
2256 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2257 2340
2258 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
… …
2317sub swap_out { 2400sub swap_out {
2318 my ($self) = @_; 2401 my ($self) = @_;
2319 2402
2320 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2321 2404
2322 return if $self->in_memory != cf::MAP_ACTIVE; 2405 return if !$self->linkable;
2323 return if $self->{deny_save}; 2406 return if $self->{deny_save};
2324 return if $self->players; 2407 return if $self->players;
2325 2408
2326 # first deactivate the map and "unlink" it from the core 2409 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate; 2410 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP; 2411 $_->clear_links_to ($self) for values %cf::MAP;
2329 $self->in_memory (cf::MAP_SWAPPED); 2412 $self->state (cf::MAP_SWAPPED);
2330 2413
2331 # then atomically save 2414 # then atomically save
2332 $self->_save; 2415 $self->_save;
2333 2416
2334 # then free the map 2417 # then free the map
… …
2360 2443
2361 return if $self->players; 2444 return if $self->players;
2362 2445
2363 cf::trace "resetting map ", $self->path, "\n"; 2446 cf::trace "resetting map ", $self->path, "\n";
2364 2447
2365 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2366 2449
2367 # need to save uniques path 2450 # need to save uniques path
2368 unless ($self->{deny_save}) { 2451 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq; 2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370 2453
… …
2700 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2701 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2702 if $x <= 0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2703 2786
2704 $map->load; 2787 $map->load;
2705 $map->load_neighbours;
2706 2788
2707 return unless $self->contr->active; 2789 return unless $self->contr->active;
2708 2790
2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2710 if ($self->enter_map ($map, $x, $y)) { 2792 if ($self->enter_map ($map, $x, $y)) {
… …
2766 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2767 } 2849 }
2768 } 2850 }
2769 2851
2770 my $map = eval { 2852 my $map = eval {
2771 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2772 2854
2773 if ($map) { 2855 if ($map) {
2774 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2775 $map = $check->($map, $x, $y, $self) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2776 } else { 2858 } else {
… …
2866 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2867 2949
2868 unless (eval { 2950 unless (eval {
2869 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2870 2952
2871 # random map handling
2872 {
2873 my $guard = cf::lock_acquire "exit_prepare:$exit";
2874
2875 prepare_random_map $exit
2876 if $exit->slaying eq "/!";
2877 }
2878
2879 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2880 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2881 my $y = $exit->stats->sp; 2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2882 2979
2883 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2884 2981
2885 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2886 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
… …
3128=cut 3225=cut
3129 3226
3130sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
3131 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
3132 3229
3133 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3135 } elsif ($self->extcmd == 1) {
3136 #TODO: version 1, remove
3137 unshift @msg, msgtype => "reply", msgid => $id;
3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3139 }
3140} 3233}
3141 3234
3142=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
3143 3236
3144Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
… …
3199 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
3200 3293
3201 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3202 3295
3203 if (ref $msg) { 3296 if (ref $msg) {
3204 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3205 "ARRAY" eq ref $msg
3206 ? @$msg
3207 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3208 3298
3209 my @reply; 3299 my @reply;
3210 3300
3211 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
3212 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
… …
3401 3491
3402 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3403 3493
3404 trace "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3405 3495
3406 0 < aio_load $path, my $facedata 3496 my $facedata = decode_storable load_file $path;
3407 or die "$path: $!";
3408
3409 $facedata = Coro::Storable::thaw $facedata;
3410 3497
3411 $facedata->{version} == 2 3498 $facedata->{version} == 2
3412 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3413 3500
3414 # patch in the exptable 3501 # patch in the exptable
… …
3465 3552
3466 { 3553 {
3467 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3468 3555
3469 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3470 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3471 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3472 3560
3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3474 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3475 } else { 3564 } else {
3476 $RESOURCE{$name} = $info; # unused 3565# $RESOURCE{$name} = $info; # unused
3477 } 3566 }
3478 3567
3479 cf::cede_to_tick; 3568 cf::cede_to_tick;
3480 } 3569 }
3481 } 3570 }
… …
3533} 3622}
3534 3623
3535sub reload_sound { 3624sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n"; 3625 trace "loading sound config from $DATADIR/sound\n";
3537 3626
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3542 3628
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_] 3630 my $sound = $soundconf->{compat}[$_]
3545 or next; 3631 or next;
3546 3632
… …
3570} 3656}
3571 3657
3572sub reload_config { 3658sub reload_config {
3573 trace "reloading config file...\n"; 3659 trace "reloading config file...\n";
3574 3660
3575 0 < aio_load "$CONFDIR/config", my $config 3661 my $config = load_file "$CONFDIR/config";
3576 or die "$CONFDIR/config: $!";
3577
3578 utf8::decode $config; 3662 utf8::decode $config;
3579 *CFG = yaml_load $config; 3663 *CFG = decode_yaml $config;
3580 3664
3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3582 3666
3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3622 3706
3623sub main { 3707sub main {
3624 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3625 3709
3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3630 3714
3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3632 3716
… …
3674 }; 3758 };
3675 3759
3676 cf::object::thawer::errors_are_fatal 0; 3760 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n"; 3761 info "parse errors in files are no longer fatal from this point on.\n";
3678 3762
3679 my $free_main; $free_main = EV::idle sub { 3763 AE::postpone {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :) 3764 undef &main; # free gobs of memory :)
3682 }; 3765 };
3683 3766
3684 goto &main_loop; 3767 goto &main_loop;
3685} 3768}
… …
3842 3925
3843 cf::write_runtime_sync; # external watchdog should not bark 3926 cf::write_runtime_sync; # external watchdog should not bark
3844 3927
3845 trace "emergency_perl_save: flushing outstanding aio requests"; 3928 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) { 3929 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3848 } 3931 }
3849 3932
3850 cf::write_runtime_sync; # external watchdog should not bark 3933 cf::write_runtime_sync; # external watchdog should not bark
3851 }; 3934 };
3852 3935
… …
4033 4116
4034############################################################################# 4117#############################################################################
4035 4118
4036my $bug_warning = 0; 4119my $bug_warning = 0;
4037 4120
4038our @WAIT_FOR_TICK;
4039our @WAIT_FOR_TICK_BEGIN;
4040
4041sub wait_for_tick() { 4121sub wait_for_tick() {
4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4043 4123
4044 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
4045 push @WAIT_FOR_TICK, $signal;
4046 $signal->wait;
4047} 4125}
4048 4126
4049sub wait_for_tick_begin() { 4127sub wait_for_tick_begin() {
4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4051 4129
4052 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
4053 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
4054 $signal->wait; 4132 $signal->wait;
4055} 4133}
… …
4059 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4060 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
4061 return; 4139 return;
4062 } 4140 }
4063 4141
4064 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4065 4143
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067 4145
4068 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4075 } 4153 }
4076 4154
4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4078 $sig->send; 4156 $sig->send;
4079 } 4157 }
4080 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
4081 $sig->send;
4082 }
4083 4159
4084 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
4085 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4086 4162
4087 if (0) { 4163 if (0) {
… …
4096{ 4172{
4097 # configure BDB 4173 # configure BDB
4098 4174
4099 BDB::min_parallel 16; 4175 BDB::min_parallel 16;
4100 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
4101 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
4102 4178
4103 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
4104 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
4105 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4106 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;

Diff Legend

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