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.573 by root, Sun May 8 12:40:42 2011 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 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.
… …
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 = 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
349=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
350 392
351Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
352 394
353=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
360 402
361sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
362sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
363 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
364=item $ref = cf::yaml_load $scalar 414=item $ref = cf::decode_yaml $scalar
365 415
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367 417
368=cut 418=cut
369 419
370sub fork_call(&@); 420sub decode_yaml($) {
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_ 421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
374} 435}
375 436
376=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
377 438
378Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
462 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
463} 524}
464 525
465=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
466 527
467Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
468This call blocks and returns only when you have at least C<$time> seconds 529(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. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
470 535
471The optional C<$name> can be used to identify the job to run. It might be 536The 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. 537used for statistical purposes and should identify the same time-class.
473 538
474Useful for short background jobs. 539Useful for short background jobs.
… …
503 } 568 }
504 } 569 }
505 570
506 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
507 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
508 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
509 $signal->wait;
510 } else { 574 } else {
511 $busy = 0; 575 $busy = 0;
512 Coro::schedule; 576 Coro::schedule;
513 } 577 }
514 } 578 }
… …
769 833
770 my @data; 834 my @data;
771 my $md5; 835 my $md5;
772 836
773 for (0 .. $#$src) { 837 for (0 .. $#$src) {
774 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
775 or Carp::croak "$src->[$_]: $!";
776 } 839 }
777 840
778 # if processing is expensive, check 841 # if processing is expensive, check
779 # checksum first 842 # checksum first
780 if (1) { 843 if (1) {
… …
1514 1577
1515 while (my ($k, $v) = each %todo) { 1578 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory}; 1580 if exists $v->{meta}{mandatory};
1518 } 1581 }
1582
1583 last;
1519 } 1584 }
1520 } 1585 }
1521 }; 1586 };
1522} 1587}
1523 1588
… …
1951 2016
1952 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1953 () 2018 ()
1954} 2019}
1955 2020
2021# may re-bless or do other evil things
1956sub init { 2022sub init {
1957 my ($self) = @_; 2023 my ($self) = @_;
1958 2024
1959 $self 2025 $self
1960} 2026}
… …
2025 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
2026 2092
2027 1 2093 1
2028} 2094}
2029 2095
2096# used to laod the header of an original map
2030sub load_header_orig { 2097sub load_header_orig {
2031 my ($self) = @_; 2098 my ($self) = @_;
2032 2099
2033 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
2034} 2101}
2035 2102
2103# used to laod the header of an instantiated map
2036sub load_header_temp { 2104sub load_header_temp {
2037 my ($self) = @_; 2105 my ($self) = @_;
2038 2106
2039 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2040} 2108}
2041 2109
2110# called after loading the header from an instantiated map
2042sub prepare_temp { 2111sub prepare_temp {
2043 my ($self) = @_; 2112 my ($self) = @_;
2044 2113
2045 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2046 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2047 # safety 2116 # safety
2048 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2049 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2050} 2119}
2051 2120
2121# called after loading the header from an original map
2052sub prepare_orig { 2122sub prepare_orig {
2053 my ($self) = @_; 2123 my ($self) = @_;
2054 2124
2055 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2056 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2082sub find { 2152sub find {
2083 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2084 2154
2085 cf::cede_to_tick; 2155 cf::cede_to_tick;
2086 2156
2087 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2088 2158
2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2090 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2091 2161
2092 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2123 2193
2124 { 2194 {
2125 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2126 2196
2127 return unless $self->valid; 2197 return unless $self->valid;
2128 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2129
2130 $self->in_memory (cf::MAP_LOADING);
2131 2199
2132 $self->alloc; 2200 $self->alloc;
2133 2201
2134 $self->pre_load; 2202 $self->pre_load;
2135 cf::cede_to_tick; 2203 cf::cede_to_tick;
2136 2204
2205 if (exists $self->{load_path}) {
2137 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2138 $f->skip_block; 2207 $f->skip_block;
2139 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2140 or return; 2209 or return;
2141 2210
2142 $self->post_load_original 2211 $self->post_load_original
2143 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2144 2213
2145 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2146 utf8::encode $uniq; 2215 utf8::encode $uniq;
2147 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2148 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2149 $self->clear_unique_items; 2218 $self->clear_unique_items;
2150 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2151 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2152 } 2222 }
2153 } 2223 }
2154 }
2155 2224
2156 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2157 2232
2158 cf::cede_to_tick; 2233 cf::cede_to_tick;
2159 # now do the right thing for maps 2234 # now do the right thing for maps
2160 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2161 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2165 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2166 $self->decay_objects; 2241 $self->decay_objects;
2167 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2168 $self->update_buttons; 2243 $self->update_buttons;
2169 cf::cede_to_tick; 2244 cf::cede_to_tick;
2170 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2171 } 2246 }
2172 2247
2173 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2174 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2175
2176 $self->in_memory (cf::MAP_ACTIVE);
2177 } 2250 }
2178 2251
2179 $self->post_load; 2252 $self->post_load;
2180 2253
2181 1 2254 1
… …
2224} 2297}
2225 2298
2226sub find_sync { 2299sub find_sync {
2227 my ($path, $origin) = @_; 2300 my ($path, $origin) = @_;
2228 2301
2302 # it's a bug to call this from the main context
2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2303 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main; 2304 if $Coro::current == $Coro::main;
2231 2305
2232 find $path, $origin 2306 find $path, $origin
2233} 2307}
2234 2308
2235sub do_load_sync { 2309sub do_load_sync {
2236 my ($map) = @_; 2310 my ($map) = @_;
2237 2311
2312 # it's a bug to call this from the main context
2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2313 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2239 if $Coro::current == $Coro::main; 2314 if $Coro::current == $Coro::main;
2240 2315
2241 $map->load; 2316 $map->load;
2242} 2317}
… …
2245our $MAP_PREFETCHER = undef; 2320our $MAP_PREFETCHER = undef;
2246 2321
2247sub find_async { 2322sub find_async {
2248 my ($path, $origin, $load) = @_; 2323 my ($path, $origin, $load) = @_;
2249 2324
2250 $path = normalise $path, $origin && $origin->{path}; 2325 $path = normalise $path, $origin;
2251 2326
2252 if (my $map = $cf::MAP{$path}) { 2327 if (my $map = $cf::MAP{$path}) {
2253 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2328 return $map if !$load || $map->linkable;
2254 } 2329 }
2255 2330
2256 $MAP_PREFETCH{$path} |= $load; 2331 $MAP_PREFETCH{$path} |= $load;
2257 2332
2258 $MAP_PREFETCHER ||= cf::async { 2333 $MAP_PREFETCHER ||= cf::async {
… …
2317sub swap_out { 2392sub swap_out {
2318 my ($self) = @_; 2393 my ($self) = @_;
2319 2394
2320 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2321 2396
2322 return if $self->in_memory != cf::MAP_ACTIVE; 2397 return if !$self->linkable;
2323 return if $self->{deny_save}; 2398 return if $self->{deny_save};
2324 return if $self->players; 2399 return if $self->players;
2325 2400
2326 # first deactivate the map and "unlink" it from the core 2401 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate; 2402 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP; 2403 $_->clear_links_to ($self) for values %cf::MAP;
2329 $self->in_memory (cf::MAP_SWAPPED); 2404 $self->state (cf::MAP_SWAPPED);
2330 2405
2331 # then atomically save 2406 # then atomically save
2332 $self->_save; 2407 $self->_save;
2333 2408
2334 # then free the map 2409 # then free the map
… …
2360 2435
2361 return if $self->players; 2436 return if $self->players;
2362 2437
2363 cf::trace "resetting map ", $self->path, "\n"; 2438 cf::trace "resetting map ", $self->path, "\n";
2364 2439
2365 $self->in_memory (cf::MAP_SWAPPED); 2440 $self->state (cf::MAP_SWAPPED);
2366 2441
2367 # need to save uniques path 2442 # need to save uniques path
2368 unless ($self->{deny_save}) { 2443 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq; 2444 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370 2445
… …
2766 ($path, $x, $y) = (undef, undef, undef); 2841 ($path, $x, $y) = (undef, undef, undef);
2767 } 2842 }
2768 } 2843 }
2769 2844
2770 my $map = eval { 2845 my $map = eval {
2771 my $map = defined $path ? cf::map::find $path : undef; 2846 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2772 2847
2773 if ($map) { 2848 if ($map) {
2774 $map = $map->customise_for ($self); 2849 $map = $map->customise_for ($self);
2775 $map = $check->($map, $x, $y, $self) if $check && $map; 2850 $map = $check->($map, $x, $y, $self) if $check && $map;
2776 } else { 2851 } else {
… …
2866 $Coro::current->{desc} = "enter_exit"; 2941 $Coro::current->{desc} = "enter_exit";
2867 2942
2868 unless (eval { 2943 unless (eval {
2869 $self->deactivate_recursive; # just to be sure 2944 $self->deactivate_recursive; # just to be sure
2870 2945
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; 2946 my $map = cf::map::normalise $exit->slaying, $exit->map;
2880 my $x = $exit->stats->hp; 2947 my $x = $exit->stats->hp;
2881 my $y = $exit->stats->sp; 2948 my $y = $exit->stats->sp;
2949
2950 # special map handling
2951 my $slaying = $exit->slaying;
2952
2953 # special map handling
2954 if ($slaying eq "/!") {
2955 my $guard = cf::lock_acquire "exit_prepare:$exit";
2956
2957 prepare_random_map $exit
2958 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2959
2960 $map = $exit->slaying;
2961
2962 } elsif ($slaying eq '!up') {
2963 $map = $exit->map->tile_path (cf::TILE_UP);
2964 $x = $exit->x;
2965 $y = $exit->y;
2966
2967 } elsif ($slaying eq '!down') {
2968 $map = $exit->map->tile_path (cf::TILE_DOWN);
2969 $x = $exit->x;
2970 $y = $exit->y;
2971 }
2882 2972
2883 $self->goto ($map, $x, $y); 2973 $self->goto ($map, $x, $y);
2884 2974
2885 # if exit is damned, update players death & WoR home-position 2975 # if exit is damned, update players death & WoR home-position
2886 $self->contr->savebed ($map, $x, $y) 2976 $self->contr->savebed ($map, $x, $y)
… …
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
… …
3533} 3620}
3534 3621
3535sub reload_sound { 3622sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n"; 3623 trace "loading sound config from $DATADIR/sound\n";
3537 3624
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); 3625 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3542 3626
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3627 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_] 3628 my $sound = $soundconf->{compat}[$_]
3545 or next; 3629 or next;
3546 3630
… …
3570} 3654}
3571 3655
3572sub reload_config { 3656sub reload_config {
3573 trace "reloading config file...\n"; 3657 trace "reloading config file...\n";
3574 3658
3575 0 < aio_load "$CONFDIR/config", my $config 3659 my $config = load_file "$CONFDIR/config";
3576 or die "$CONFDIR/config: $!";
3577
3578 utf8::decode $config; 3660 utf8::decode $config;
3579 *CFG = yaml_load $config; 3661 *CFG = decode_yaml $config;
3580 3662
3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3663 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3582 3664
3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3665 $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}; 3666 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3622 3704
3623sub main { 3705sub main {
3624 cf::init_globals; # initialise logging 3706 cf::init_globals; # initialise logging
3625 3707
3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3708 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3709 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3710 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3711 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3630 3712
3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3713 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3632 3714
… …
4033 4115
4034############################################################################# 4116#############################################################################
4035 4117
4036my $bug_warning = 0; 4118my $bug_warning = 0;
4037 4119
4038our @WAIT_FOR_TICK;
4039our @WAIT_FOR_TICK_BEGIN;
4040
4041sub wait_for_tick() { 4120sub wait_for_tick() {
4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4121 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4043 4122
4044 my $signal = new Coro::Signal; 4123 $WAIT_FOR_TICK->wait;
4045 push @WAIT_FOR_TICK, $signal;
4046 $signal->wait;
4047} 4124}
4048 4125
4049sub wait_for_tick_begin() { 4126sub wait_for_tick_begin() {
4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4127 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4051 4128
4052 my $signal = new Coro::Signal; 4129 my $signal = new Coro::Signal;
4053 push @WAIT_FOR_TICK_BEGIN, $signal; 4130 push @WAIT_FOR_TICK_BEGIN, $signal;
4054 $signal->wait; 4131 $signal->wait;
4055} 4132}
… …
4059 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4136 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4060 unless ++$bug_warning > 10; 4137 unless ++$bug_warning > 10;
4061 return; 4138 return;
4062 } 4139 }
4063 4140
4064 cf::server_tick; # one server iteration 4141 cf::one_tick; # one server iteration
4065 4142
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4143 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067 4144
4068 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4145 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4146 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4075 } 4152 }
4076 4153
4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4154 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4078 $sig->send; 4155 $sig->send;
4079 } 4156 }
4080 while (my $sig = shift @WAIT_FOR_TICK) { 4157 $WAIT_FOR_TICK->broadcast;
4081 $sig->send;
4082 }
4083 4158
4084 $LOAD = ($NOW - $TICK_START) / $TICK; 4159 $LOAD = ($NOW - $TICK_START) / $TICK;
4085 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4160 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4086 4161
4087 if (0) { 4162 if (0) {

Diff Legend

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