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.544 by root, Thu May 6 21:58:07 2010 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 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.
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
135our $NOW; 138our $NOW;
136 139
137our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
148 151
149our @POST_INIT; 152our @POST_INIT;
150 153
151our $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)
152our $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;
153 159
154binmode STDOUT; 160binmode STDOUT;
155binmode STDERR; 161binmode STDERR;
156 162
157# read virtual server time, if available 163# read virtual server time, if available
… …
191 197
192=over 4 198=over 4
193 199
194=item $cf::UPTIME 200=item $cf::UPTIME
195 201
196The 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.
197 218
198=item $cf::RUNTIME 219=item $cf::RUNTIME
199 220
200The 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
201every server tick. 222every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
210database environment. 231database environment.
211 232
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 233=item $cf::LOADAVG
221 234
222The 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
223(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
224objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
233from wherever your confdir points to. 246from wherever your confdir points to.
234 247
235=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
236 249
237These 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
238returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
239per 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.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
240 270
241=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
242 272
243This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
307} 337}
308 338
309$EV::DIED = sub { 339$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
311}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
312 347
313############################################################################# 348#############################################################################
314 349
315=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
316 351
… …
337 $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;
338 $d 373 $d
339 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
340} 375}
341 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
342=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
343 392
344Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
345 394
346=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
352our $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
353 402
354sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
356 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
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
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]
435}
436
357=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
358 438
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
361 441
362The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 443is a reload or not.
364 444
365=cut 445=cut
366 446
367sub post_init(&) { 447sub post_init(&) {
368 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
369} 466}
370 467
371=item cf::lock_wait $string 468=item cf::lock_wait $string
372 469
373Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
427} 524}
428 525
429=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
430 527
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
432This 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
433of 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.
434 535
435The 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
436used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
437 538
438Useful for short background jobs. 539Useful for short background jobs.
… …
467 } 568 }
468 } 569 }
469 570
470 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
471 # 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
472 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
473 $signal->wait;
474 } else { 574 } else {
475 $busy = 0; 575 $busy = 0;
476 Coro::schedule; 576 Coro::schedule;
477 } 577 }
478 } 578 }
… …
578 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
579 679
580 $coro 680 $coro
581} 681}
582 682
583=item fork_call { }, $args 683=item fork_call { }, @args
584 684
585Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 688never block itself or use any form of event handling.
589 689
590=cut 690=cut
591 691
692sub post_fork {
693 reset_signals;
694}
695
592sub fork_call(&@) { 696sub fork_call(&@) {
593 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
594 698
595 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
598 702
599 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
600 reset_signals; 704 cf::post_fork;
601 &$cb 705 &$cb
602 }, @args; 706 } @args;
603 707
604 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
605} 709}
606 710
607sub objinfo { 711sub objinfo {
… …
729 833
730 my @data; 834 my @data;
731 my $md5; 835 my $md5;
732 836
733 for (0 .. $#$src) { 837 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 839 }
737 840
738 # if processing is expensive, check 841 # if processing is expensive, check
739 # checksum first 842 # checksum first
740 if (1) { 843 if (1) {
… …
1474 1577
1475 while (my ($k, $v) = each %todo) { 1578 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1580 if exists $v->{meta}{mandatory};
1478 } 1581 }
1582
1583 last;
1479 } 1584 }
1480 } 1585 }
1481 }; 1586 };
1482} 1587}
1483 1588
… …
1641 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1642 1747
1643 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1645 1750
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1752 $pl->deactivate;
1753
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1650 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1651 1759
1652 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1928sub generate_random_map {
1821 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1822 1930
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824 1932
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1934}
1840 1935
1841=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1842 1937
1843Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
… …
1894 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1895 $path = "$base/$path"; 1990 $path = "$base/$path";
1896 } 1991 }
1897 1992
1898 for ($path) { 1993 for ($path) {
1899 redo if s{//}{/};
1900 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1901 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1902 } 1996 }
1903 1997
1904 $path 1998 $path
… …
1922 2016
1923 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1924 () 2018 ()
1925} 2019}
1926 2020
2021# may re-bless or do other evil things
1927sub init { 2022sub init {
1928 my ($self) = @_; 2023 my ($self) = @_;
1929 2024
1930 $self 2025 $self
1931} 2026}
… …
1996 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1997 2092
1998 1 2093 1
1999} 2094}
2000 2095
2096# used to laod the header of an original map
2001sub load_header_orig { 2097sub load_header_orig {
2002 my ($self) = @_; 2098 my ($self) = @_;
2003 2099
2004 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
2005} 2101}
2006 2102
2103# used to laod the header of an instantiated map
2007sub load_header_temp { 2104sub load_header_temp {
2008 my ($self) = @_; 2105 my ($self) = @_;
2009 2106
2010 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2011} 2108}
2012 2109
2110# called after loading the header from an instantiated map
2013sub prepare_temp { 2111sub prepare_temp {
2014 my ($self) = @_; 2112 my ($self) = @_;
2015 2113
2016 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2017 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2018 # safety 2116 # safety
2019 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2020 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2021} 2119}
2022 2120
2121# called after loading the header from an original map
2023sub prepare_orig { 2122sub prepare_orig {
2024 my ($self) = @_; 2123 my ($self) = @_;
2025 2124
2026 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2027 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2053sub find { 2152sub find {
2054 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2055 2154
2056 cf::cede_to_tick; 2155 cf::cede_to_tick;
2057 2156
2058 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2059 2158
2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2062 2161
2063 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2094 2193
2095 { 2194 {
2096 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2097 2196
2098 return unless $self->valid; 2197 return unless $self->valid;
2099 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2100
2101 $self->in_memory (cf::MAP_LOADING);
2102 2199
2103 $self->alloc; 2200 $self->alloc;
2104 2201
2105 $self->pre_load; 2202 $self->pre_load;
2106 cf::cede_to_tick; 2203 cf::cede_to_tick;
2107 2204
2205 if (exists $self->{load_path}) {
2108 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2109 $f->skip_block; 2207 $f->skip_block;
2110 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2111 or return; 2209 or return;
2112 2210
2113 $self->post_load_original 2211 $self->post_load_original
2114 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2115 2213
2116 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2117 utf8::encode $uniq; 2215 utf8::encode $uniq;
2118 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2119 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2120 $self->clear_unique_items; 2218 $self->clear_unique_items;
2121 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2122 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2123 } 2222 }
2124 } 2223 }
2125 }
2126 2224
2127 $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);
2128 2232
2129 cf::cede_to_tick; 2233 cf::cede_to_tick;
2130 # now do the right thing for maps 2234 # now do the right thing for maps
2131 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2132 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2135 2239
2136 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2137 $self->decay_objects; 2241 $self->decay_objects;
2138 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2139 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2140 cf::cede_to_tick; 2245 cf::cede_to_tick;
2141 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2142 } 2247 }
2143 2248
2144 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2145 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2146
2147 $self->in_memory (cf::MAP_ACTIVE);
2148 } 2251 }
2149 2252
2150 $self->post_load; 2253 $self->post_load;
2254
2255 1
2151} 2256}
2152 2257
2153# customize the map for a given player, i.e. 2258# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player 2259# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath 2260# maps to change the path to ~playername/mappath
… …
2193} 2298}
2194 2299
2195sub find_sync { 2300sub find_sync {
2196 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2197 2302
2303 # it's a bug to call this from the main context
2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main; 2305 if $Coro::current == $Coro::main;
2200 2306
2201 find $path, $origin 2307 find $path, $origin
2202} 2308}
2203 2309
2204sub do_load_sync { 2310sub do_load_sync {
2205 my ($map) = @_; 2311 my ($map) = @_;
2206 2312
2313 # it's a bug to call this from the main context
2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2208 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2209 2316
2210 $map->load; 2317 $map->load;
2211} 2318}
… …
2214our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2215 2322
2216sub find_async { 2323sub find_async {
2217 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2218 2325
2219 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2220 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2221 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2222 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2223 } 2332 }
2224 2333
2225 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2226 2335
2227 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
… …
2286sub swap_out { 2395sub swap_out {
2287 my ($self) = @_; 2396 my ($self) = @_;
2288 2397
2289 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290 2399
2291 return if $self->in_memory != cf::MAP_ACTIVE; 2400 return if !$self->linkable;
2292 return if $self->{deny_save}; 2401 return if $self->{deny_save};
2293 return if $self->players; 2402 return if $self->players;
2294 2403
2295 # first deactivate the map and "unlink" it from the core 2404 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate; 2405 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP; 2406 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->in_memory (cf::MAP_SWAPPED); 2407 $self->state (cf::MAP_SWAPPED);
2299 2408
2300 # then atomically save 2409 # then atomically save
2301 $self->_save; 2410 $self->_save;
2302 2411
2303 # then free the map 2412 # then free the map
… …
2329 2438
2330 return if $self->players; 2439 return if $self->players;
2331 2440
2332 cf::trace "resetting map ", $self->path, "\n"; 2441 cf::trace "resetting map ", $self->path, "\n";
2333 2442
2334 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2335 2444
2336 # need to save uniques path 2445 # need to save uniques path
2337 unless ($self->{deny_save}) { 2446 unless ($self->{deny_save}) {
2338 my $uniq = $self->uniq_path; utf8::encode $uniq; 2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2339 2448
… …
2735 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2736 } 2845 }
2737 } 2846 }
2738 2847
2739 my $map = eval { 2848 my $map = eval {
2740 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2741 2850
2742 if ($map) { 2851 if ($map) {
2743 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2744 $map = $check->($map, $x, $y, $self) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2745 } else { 2854 } else {
… …
2835 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2836 2945
2837 unless (eval { 2946 unless (eval {
2838 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2839 2948
2840 # random map handling
2841 {
2842 my $guard = cf::lock_acquire "exit_prepare:$exit";
2843
2844 prepare_random_map $exit
2845 if $exit->slaying eq "/!";
2846 }
2847
2848 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2849 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2850 my $y = $exit->stats->sp; 2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2851 2975
2852 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2853 2977
2854 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2855 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
… …
3370 3494
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3496
3373 trace "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3374 3498
3375 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3500
3381 $facedata->{version} == 2 3501 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3503
3384 # patch in the exptable 3504 # patch in the exptable
… …
3398 3518
3399 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3403 3524
3404 cf::cede_to_tick; 3525 cf::cede_to_tick;
3405 } 3526 }
3406 3527
3407 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
… …
3499sub reload_treasures { 3620sub reload_treasures {
3500 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3501 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3502} 3623}
3503 3624
3504sub reload_exp {
3505 cf::init_experience;
3506}
3507
3508sub reload_sound { 3625sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n"; 3626 trace "loading sound config from $DATADIR/sound\n";
3510 3627
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3515 3629
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_] 3631 my $sound = $soundconf->{compat}[$_]
3518 or next; 3632 or next;
3519 3633
… …
3529} 3643}
3530 3644
3531sub reload_resources { 3645sub reload_resources {
3532 trace "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3533 3647
3534 reload_exp; 3648 reload_exp_table;
3649 reload_materials;
3535 reload_facedata; 3650 reload_facedata;
3536 reload_sound; 3651 reload_sound;
3537 reload_archetypes; 3652 reload_archetypes;
3538 reload_regions; 3653 reload_regions;
3539 reload_treasures; 3654 reload_treasures;
… …
3542} 3657}
3543 3658
3544sub reload_config { 3659sub reload_config {
3545 trace "reloading config file...\n"; 3660 trace "reloading config file...\n";
3546 3661
3547 open my $fh, "<:utf8", "$CONFDIR/config" 3662 my $config = load_file "$CONFDIR/config";
3548 or return; 3663 utf8::decode $config;
3549 3664 *CFG = decode_yaml $config;
3550 local $/;
3551 *CFG = YAML::XS::Load scalar <$fh>;
3552 3665
3553 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3554 3667
3555 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3556 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3560 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3673 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3561 and die "WARNING: m(un)lockall failed: $!\n"; 3674 and die "WARNING: m(un)lockall failed: $!\n";
3562 }; 3675 };
3563 warn $@ if $@; 3676 warn $@ if $@;
3564 } 3677 }
3565
3566 trace "finished reloading resource files\n";
3567} 3678}
3568 3679
3569sub pidfile() { 3680sub pidfile() {
3570 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3571 or die "$PIDFILE: $!"; 3682 or die "$PIDFILE: $!";
… …
3596 3707
3597sub main { 3708sub main {
3598 cf::init_globals; # initialise logging 3709 cf::init_globals; # initialise logging
3599 3710
3600 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3601 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3602 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3603 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3604 3715
3605 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3606 3717
… …
3621 cf::init_anim; 3732 cf::init_anim;
3622 cf::init_attackmess; 3733 cf::init_attackmess;
3623 cf::init_dynamic; 3734 cf::init_dynamic;
3624 3735
3625 cf::load_settings; 3736 cf::load_settings;
3626 cf::load_materials;
3627 3737
3628 reload_resources; 3738 reload_resources;
3629 reload_config; 3739 reload_config;
3630 db_init; 3740 db_init;
3631 3741
… …
3643 3753
3644 # no (long-running) fork's whatsoever before this point(!) 3754 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX (); 3755 use POSIX ();
3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3647 3757
3648 (pop @POST_INIT)->(0) while @POST_INIT; 3758 cf::_post_init 0;
3649 }; 3759 };
3650 3760
3651 cf::object::thawer::errors_are_fatal 0; 3761 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n"; 3762 info "parse errors in files are no longer fatal from this point on.\n";
3653 3763
… …
3876 3986
3877 my $t1 = AE::time; 3987 my $t1 = AE::time;
3878 3988
3879 while ($RELOAD) { 3989 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl"; 3990 cf::get_slot 0.1, -1, "reload_perl";
3881 info "reloading..."; 3991 info "perl_reload: reloading...";
3882 3992
3883 trace "entering sync_job"; 3993 trace "perl_reload: entering sync_job";
3884 3994
3885 cf::sync_job { 3995 cf::sync_job {
3886 #cf::emergency_save; 3996 #cf::emergency_save;
3887 3997
3888 trace "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3889 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3890 %EXT_CORO = (); 4000 %EXT_CORO = ();
3891 4001
3892 trace "removing commands"; 4002 trace "perl_reload: removing commands";
3893 %COMMAND = (); 4003 %COMMAND = ();
3894 4004
3895 trace "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3896 %EXTCMD = (); 4006 %EXTCMD = ();
3897 %EXTICMD = (); 4007 %EXTICMD = ();
3898 4008
3899 trace "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3900 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3901 trace "... unloading $pkg"; 4011 trace "... unloading $pkg";
3902 4012
3903 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3904 eval { 4014 eval {
… …
3909 4019
3910 trace "... clearing $pkg"; 4020 trace "... clearing $pkg";
3911 clear_package $pkg; 4021 clear_package $pkg;
3912 } 4022 }
3913 4023
3914 trace "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3915 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3917 4027
3918 trace "... unloading $k"; 4028 trace "... unloading $k";
3919 delete $INC{$k}; 4029 delete $INC{$k};
… …
3926 } 4036 }
3927 4037
3928 clear_package $k; 4038 clear_package $k;
3929 } 4039 }
3930 4040
3931 trace "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3932 clear_package "safe::$_" 4042 clear_package "safe::$_"
3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3934 4044
3935 trace "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3936 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3938 4048
3939 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3940 # and global variables created in xs 4050 # and global variables created in xs
3941 #clear_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3942 4052
3943 info "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3944 4054
3945 trace "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3946 require cf; 4056 require cf;
3947 cf::_connect_to_perl_1; 4057 cf::_connect_to_perl_1;
3948 4058
3949 trace "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3950 cf::reload_config; 4060 cf::reload_config;
3951 4061
3952 trace "loading extensions"; 4062 trace "perl_reload: loading extensions";
3953 cf::load_extensions; 4063 cf::load_extensions;
3954 4064
3955 if ($REATTACH_ON_RELOAD) { 4065 if ($REATTACH_ON_RELOAD) {
3956 trace "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3957 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3958 trace "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3959 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3960 trace "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3961 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
3962 } 4072 }
3963 4073
3964 trace "running post_init jobs"; 4074 cf::_post_init 1;
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966 4075
3967 trace "leaving sync_job"; 4076 trace "perl_reload: leaving sync_job";
3968 4077
3969 1 4078 1
3970 } or do { 4079 } or do {
3971 error $@; 4080 error $@;
3972 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
3973 }; 4082 };
3974 4083
3975 info "reloaded";
3976 --$RELOAD; 4084 --$RELOAD;
3977 } 4085 }
3978 4086
3979 $t1 = AE::time - $t1; 4087 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n"; 4088 info "perl_reload: completed in ${t1}s\n";
3981}; 4089};
3982 4090
3983our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3984 4092
3985sub reload_perl() { 4093sub reload_perl() {
… …
4010 4118
4011############################################################################# 4119#############################################################################
4012 4120
4013my $bug_warning = 0; 4121my $bug_warning = 0;
4014 4122
4015our @WAIT_FOR_TICK;
4016our @WAIT_FOR_TICK_BEGIN;
4017
4018sub wait_for_tick { 4123sub wait_for_tick() {
4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4020 4125
4021 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
4022 push @WAIT_FOR_TICK, $signal;
4023 $signal->wait;
4024} 4127}
4025 4128
4026sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4028 4131
4029 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
4030 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
4031 $signal->wait; 4134 $signal->wait;
4032} 4135}
… …
4036 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4037 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
4038 return; 4141 return;
4039 } 4142 }
4040 4143
4041 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4042 4145
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044 4147
4045 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4052 } 4155 }
4053 4156
4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4055 $sig->send; 4158 $sig->send;
4056 } 4159 }
4057 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
4058 $sig->send;
4059 }
4060 4161
4061 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
4062 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4063 4164
4064 if (0) { 4165 if (0) {
… …
4118 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
4119 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
4120 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
4121} 4222}
4122 4223
4123my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
4124 4226
4125sub _log_backtrace { 4227sub _log_backtrace {
4126 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
4127 4229
4128 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
4129 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4130 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
4131 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
4132 ++$_log_backtrace; 4238 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg; 4239 my $perl_bt = Carp::longmess $msg;
4134 async { 4240 async {
4135 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
4136 4242
… …
4156 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
4157 --$_log_backtrace; 4263 --$_log_backtrace;
4158 }; 4264 };
4159 } else { 4265 } else {
4160 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
4161 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4162 } 4268 }
4163} 4269}
4164 4270
4165# load additional modules 4271# load additional modules
4166require "cf/$_.pm" for @EXTRA_MODULES; 4272require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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