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.538 by root, Tue May 4 21:45:43 2010 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 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.
… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
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";
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 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;
… …
233from wherever your confdir points to. 235from wherever your confdir points to.
234 236
235=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
236 238
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These 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 240returns 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. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
240 247
241=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
242 249
243This array contains the results of the last C<invoke ()> call. When 250This 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 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
307} 314}
308 315
309$EV::DIED = sub { 316$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
311}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
312 324
313############################################################################# 325#############################################################################
314 326
315=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
316 328
… …
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 350 $d
339 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
340} 352}
341 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
342=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
343 369
344Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
345 371
346=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 379
354sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
356 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
357=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
358 415
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
361 418
362The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 420is a reload or not.
364 421
365=cut 422=cut
366 423
367sub post_init(&) { 424sub post_init(&) {
368 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
369} 443}
370 444
371=item cf::lock_wait $string 445=item cf::lock_wait $string
372 446
373Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
427} 501}
428 502
429=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
430 504
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 506(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. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
434 512
435The optional C<$name> can be used to identify the job to run. It might be 513The 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. 514used for statistical purposes and should identify the same time-class.
437 515
438Useful for short background jobs. 516Useful for short background jobs.
… …
578 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
579 657
580 $coro 658 $coro
581} 659}
582 660
583=item fork_call { }, $args 661=item fork_call { }, @args
584 662
585Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 666never block itself or use any form of event handling.
589 667
590=cut 668=cut
591 669
670sub post_fork {
671 reset_signals;
672}
673
592sub fork_call(&@) { 674sub fork_call(&@) {
593 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
594 676
595 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
598 680
599 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
600 reset_signals; 682 cf::post_fork;
601 &$cb 683 &$cb
602 }, @args; 684 } @args;
603 685
604 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
605} 687}
606 688
607sub objinfo { 689sub objinfo {
… …
729 811
730 my @data; 812 my @data;
731 my $md5; 813 my $md5;
732 814
733 for (0 .. $#$src) { 815 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 817 }
737 818
738 # if processing is expensive, check 819 # if processing is expensive, check
739 # checksum first 820 # checksum first
740 if (1) { 821 if (1) {
… …
1451 1532
1452 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1453 1534
1454 if (length $@) { 1535 if (length $@) {
1455 error "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1457 1537
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1459 if exists $v->{meta}{mandatory}; 1539 if exists $v->{meta}{mandatory};
1460 1540
1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1475 1555
1476 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1479 } 1559 }
1560
1561 last;
1480 } 1562 }
1481 } 1563 }
1482 }; 1564 };
1483} 1565}
1484 1566
… …
1642 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1643 1725
1644 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1646 1728
1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1648 $pl->deactivate; 1730 $pl->deactivate;
1731
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1650 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1651 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1652 1737
1653 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1654 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1655 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1821sub generate_random_map { 1906sub generate_random_map {
1822 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1823 1908
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825 1910
1826 # mit "rum" bekleckern, nicht
1827 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1831 $rmp->{exit_on_final_map},
1832 $rmp->{xsize}, $rmp->{ysize},
1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1835 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1836 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1837 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1838 (cf::region::find $rmp->{region}), $rmp->{custom}
1839 )
1840} 1912}
1841 1913
1842=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1843 1915
1844Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
… …
1849 1921
1850sub register { 1922sub register {
1851 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1852 my $pkg = caller; 1924 my $pkg = caller;
1853 1925
1854 no strict;
1855 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1856 1927
1857 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1858} 1929}
1859 1930
… …
1871} 1942}
1872 1943
1873sub normalise { 1944sub normalise {
1874 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1875 1946
1876 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1877 1948
1878 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1879 1950
1880 # map plan: 1951 # map plan:
1881 # 1952 #
… …
1896 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1897 $path = "$base/$path"; 1968 $path = "$base/$path";
1898 } 1969 }
1899 1970
1900 for ($path) { 1971 for ($path) {
1901 redo if s{//}{/};
1902 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1903 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1904 } 1974 }
1905 1975
1906 $path 1976 $path
… …
1920 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1921 return $self; 1991 return $self;
1922 } 1992 }
1923 } 1993 }
1924 1994
1925 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1926 () 1996 ()
1927} 1997}
1928 1998
1999# may re-bless or do other evil things
1929sub init { 2000sub init {
1930 my ($self) = @_; 2001 my ($self) = @_;
1931 2002
1932 $self 2003 $self
1933} 2004}
… …
1998 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1999 2070
2000 1 2071 1
2001} 2072}
2002 2073
2074# used to laod the header of an original map
2003sub load_header_orig { 2075sub load_header_orig {
2004 my ($self) = @_; 2076 my ($self) = @_;
2005 2077
2006 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
2007} 2079}
2008 2080
2081# used to laod the header of an instantiated map
2009sub load_header_temp { 2082sub load_header_temp {
2010 my ($self) = @_; 2083 my ($self) = @_;
2011 2084
2012 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
2013} 2086}
2014 2087
2088# called after loading the header from an instantiated map
2015sub prepare_temp { 2089sub prepare_temp {
2016 my ($self) = @_; 2090 my ($self) = @_;
2017 2091
2018 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
2019 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
2020 # safety 2094 # safety
2021 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
2022 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
2023} 2097}
2024 2098
2099# called after loading the header from an original map
2025sub prepare_orig { 2100sub prepare_orig {
2026 my ($self) = @_; 2101 my ($self) = @_;
2027 2102
2028 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
2029 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
… …
2053 2128
2054sub find; 2129sub find;
2055sub find { 2130sub find {
2056 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
2057 2132
2133 cf::cede_to_tick;
2134
2058 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
2059 2136
2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
2062 2139
2063 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
… …
2094 2171
2095 { 2172 {
2096 my $guard = cf::lock_acquire "map_data:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
2097 2174
2098 return unless $self->valid; 2175 return unless $self->valid;
2099 return unless $self->in_memory == cf::MAP_SWAPPED; 2176 return unless $self->state == cf::MAP_SWAPPED;
2100
2101 $self->in_memory (cf::MAP_LOADING);
2102 2177
2103 $self->alloc; 2178 $self->alloc;
2104 2179
2105 $self->pre_load; 2180 $self->pre_load;
2106 cf::cede_to_tick; 2181 cf::cede_to_tick;
2107 2182
2183 if (exists $self->{load_path}) {
2108 my $f = new_from_file cf::object::thawer $self->{load_path}; 2184 my $f = new_from_file cf::object::thawer $self->{load_path};
2109 $f->skip_block; 2185 $f->skip_block;
2110 $self->_load_objects ($f) 2186 $self->_load_objects ($f)
2111 or return; 2187 or return;
2112 2188
2113 $self->post_load_original 2189 $self->post_load_original
2114 if delete $self->{load_original}; 2190 if delete $self->{load_original};
2115 2191
2116 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
2117 utf8::encode $uniq; 2193 utf8::encode $uniq;
2118 unless (aio_stat $uniq) { 2194 unless (aio_stat $uniq) {
2119 if (my $f = new_from_file cf::object::thawer $uniq) { 2195 if (my $f = new_from_file cf::object::thawer $uniq) {
2120 $self->clear_unique_items; 2196 $self->clear_unique_items;
2121 $self->_load_objects ($f); 2197 $self->_load_objects ($f);
2122 $f->resolve_delayed_derefs; 2198 $f->resolve_delayed_derefs;
2199 }
2123 } 2200 }
2124 } 2201 }
2125 }
2126 2202
2127 $f->resolve_delayed_derefs; 2203 $f->resolve_delayed_derefs;
2204 } else {
2205 $self->post_load_original
2206 if delete $self->{load_original};
2207 }
2208
2209 $self->state (cf::MAP_INACTIVE);
2128 2210
2129 cf::cede_to_tick; 2211 cf::cede_to_tick;
2130 # now do the right thing for maps 2212 # now do the right thing for maps
2131 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2132 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
… …
2136 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2137 $self->decay_objects; 2219 $self->decay_objects;
2138 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2139 $self->update_buttons; 2221 $self->update_buttons;
2140 cf::cede_to_tick; 2222 cf::cede_to_tick;
2141 $self->activate; 2223 #$self->activate; # no longer activate maps automatically
2142 } 2224 }
2143 2225
2144 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2145 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2146
2147 $self->in_memory (cf::MAP_ACTIVE);
2148 } 2228 }
2149 2229
2150 $self->post_load; 2230 $self->post_load;
2231
2232 1
2151} 2233}
2152 2234
2153# customize the map for a given player, i.e. 2235# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player 2236# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath 2237# maps to change the path to ~playername/mappath
… …
2193} 2275}
2194 2276
2195sub find_sync { 2277sub find_sync {
2196 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
2197 2279
2280 # it's a bug to call this from the main context
2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main; 2282 if $Coro::current == $Coro::main;
2200 2283
2201 find $path, $origin 2284 find $path, $origin
2202} 2285}
2203 2286
2204sub do_load_sync { 2287sub do_load_sync {
2205 my ($map) = @_; 2288 my ($map) = @_;
2206 2289
2290 # it's a bug to call this from the main context
2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2208 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2209 2293
2210 $map->load; 2294 $map->load;
2211} 2295}
… …
2214our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2215 2299
2216sub find_async { 2300sub find_async {
2217 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2218 2302
2219 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2220 2304
2221 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2222 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->linkable;
2223 } 2307 }
2224 2308
2225 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2226 2310
2227 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
… …
2286sub swap_out { 2370sub swap_out {
2287 my ($self) = @_; 2371 my ($self) = @_;
2288 2372
2289 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290 2374
2291 return if $self->in_memory != cf::MAP_ACTIVE; 2375 return if !$self->linkable;
2292 return if $self->{deny_save}; 2376 return if $self->{deny_save};
2293 return if $self->players; 2377 return if $self->players;
2294 2378
2295 # first deactivate the map and "unlink" it from the core 2379 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate; 2380 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP; 2381 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->state (cf::MAP_SWAPPED);
2299 2383
2300 # then atomically save 2384 # then atomically save
2301 $self->_save; 2385 $self->_save;
2302 2386
2303 # then free the map 2387 # then free the map
… …
2329 2413
2330 return if $self->players; 2414 return if $self->players;
2331 2415
2332 cf::trace "resetting map ", $self->path, "\n"; 2416 cf::trace "resetting map ", $self->path, "\n";
2333 2417
2334 $self->in_memory (cf::MAP_SWAPPED); 2418 $self->state (cf::MAP_SWAPPED);
2335 2419
2336 # need to save uniques path 2420 # need to save uniques path
2337 unless ($self->{deny_save}) { 2421 unless ($self->{deny_save}) {
2338 my $uniq = $self->uniq_path; utf8::encode $uniq; 2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2339 2423
… …
2735 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2736 } 2820 }
2737 } 2821 }
2738 2822
2739 my $map = eval { 2823 my $map = eval {
2740 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2741 2825
2742 if ($map) { 2826 if ($map) {
2743 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2744 $map = $check->($map, $x, $y, $self) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2745 } else { 2829 } else {
… …
2835 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2836 2920
2837 unless (eval { 2921 unless (eval {
2838 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2839 2923
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; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2849 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2850 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2937
2938 $map = $exit->slaying;
2939
2940 } elsif ($slaying eq '!up') {
2941 $map = $exit->map->tile_path (cf::TILE_UP);
2942 $x = $exit->x;
2943 $y = $exit->y;
2944
2945 } elsif ($slaying eq '!down') {
2946 $map = $exit->map->tile_path (cf::TILE_DOWN);
2947 $x = $exit->x;
2948 $y = $exit->y;
2949 }
2851 2950
2852 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2853 2952
2854 # if exit is damned, update players death & WoR home-position 2953 # if exit is damned, update players death & WoR home-position
2855 $self->contr->savebed ($map, $x, $y) 2954 $self->contr->savebed ($map, $x, $y)
… …
3274 decrease split destroy change_exp value msg lore send_msg)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3275 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3276 ["cf::player" => qw(peaceful send_msg)], 3375 ["cf::player" => qw(peaceful send_msg)],
3277 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3278) { 3377) {
3279 no strict 'refs';
3280 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3281 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3282 for @funs; 3380 for @funs;
3283} 3381}
3284 3382
… …
3371 3469
3372 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3373 3471
3374 trace "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3375 3473
3376 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3377 0 < aio_load $path, $facedata
3378 or die "$path: $!";
3379
3380 $facedata = Coro::Storable::thaw $facedata;
3381 3475
3382 $facedata->{version} == 2 3476 $facedata->{version} == 2
3383 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3384 3478
3385 # patch in the exptable 3479 # patch in the exptable
… …
3399 3493
3400 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3401 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3402 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3403 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3404 3499
3405 cf::cede_to_tick; 3500 cf::cede_to_tick;
3406 } 3501 }
3407 3502
3408 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
… …
3503} 3598}
3504 3599
3505sub reload_sound { 3600sub reload_sound {
3506 trace "loading sound config from $DATADIR/sound\n"; 3601 trace "loading sound config from $DATADIR/sound\n";
3507 3602
3508 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3509 or die "$DATADIR/sound $!";
3510
3511 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3512 3604
3513 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3514 my $sound = $soundconf->{compat}[$_] 3606 my $sound = $soundconf->{compat}[$_]
3515 or next; 3607 or next;
3516 3608
… …
3526} 3618}
3527 3619
3528sub reload_resources { 3620sub reload_resources {
3529 trace "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3530 3622
3623 reload_exp_table;
3624 reload_materials;
3531 reload_facedata; 3625 reload_facedata;
3532 reload_sound; 3626 reload_sound;
3533 reload_archetypes; 3627 reload_archetypes;
3534 reload_regions; 3628 reload_regions;
3535 reload_treasures; 3629 reload_treasures;
… …
3538} 3632}
3539 3633
3540sub reload_config { 3634sub reload_config {
3541 trace "reloading config file...\n"; 3635 trace "reloading config file...\n";
3542 3636
3543 open my $fh, "<:utf8", "$CONFDIR/config" 3637 my $config = load_file "$CONFDIR/config";
3544 or return; 3638 utf8::decode $config;
3545 3639 *CFG = decode_yaml $config;
3546 local $/;
3547 *CFG = YAML::XS::Load scalar <$fh>;
3548 3640
3549 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3550 3642
3551 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3552 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3556 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3648 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3557 and die "WARNING: m(un)lockall failed: $!\n"; 3649 and die "WARNING: m(un)lockall failed: $!\n";
3558 }; 3650 };
3559 warn $@ if $@; 3651 warn $@ if $@;
3560 } 3652 }
3561
3562 trace "finished reloading resource files\n";
3563} 3653}
3564 3654
3565sub pidfile() { 3655sub pidfile() {
3566 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3656 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3567 or die "$PIDFILE: $!"; 3657 or die "$PIDFILE: $!";
… …
3592 3682
3593sub main { 3683sub main {
3594 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3595 3685
3596 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3597 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3598 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3599 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3600 3690
3601 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3602 3692
… …
3610 }; 3700 };
3611 3701
3612 evthread_start IO::AIO::poll_fileno; 3702 evthread_start IO::AIO::poll_fileno;
3613 3703
3614 cf::sync_job { 3704 cf::sync_job {
3615 cf::init_experience; 3705 cf::incloader::init ();
3706
3616 cf::init_anim; 3707 cf::init_anim;
3617 cf::init_attackmess; 3708 cf::init_attackmess;
3618 cf::init_dynamic; 3709 cf::init_dynamic;
3619 3710
3620 cf::load_settings; 3711 cf::load_settings;
3621 cf::load_materials;
3622 3712
3623 reload_resources; 3713 reload_resources;
3624 reload_config; 3714 reload_config;
3625 db_init; 3715 db_init;
3626 3716
… …
3638 3728
3639 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3640 use POSIX (); 3730 use POSIX ();
3641 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3642 3732
3643 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3644 }; 3734 };
3645 3735
3646 cf::object::thawer::errors_are_fatal 0; 3736 cf::object::thawer::errors_are_fatal 0;
3647 info "parse errors in files are no longer fatal from this point on.\n"; 3737 info "parse errors in files are no longer fatal from this point on.\n";
3648 3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3649 main_loop; 3744 goto &main_loop;
3650} 3745}
3651 3746
3652############################################################################# 3747#############################################################################
3653# initialisation and cleanup 3748# initialisation and cleanup
3654 3749
… …
3855 } 3950 }
3856} 3951}
3857 3952
3858sub do_reload_perl() { 3953sub do_reload_perl() {
3859 # can/must only be called in main 3954 # can/must only be called in main
3860 if (in_main) { 3955 unless (in_main) {
3861 error "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3862 return; 3957 return;
3863 } 3958 }
3864 3959
3865 return if $RELOAD++; 3960 return if $RELOAD++;
3866 3961
3867 my $t1 = AE::time; 3962 my $t1 = AE::time;
3868 3963
3869 while ($RELOAD) { 3964 while ($RELOAD) {
3965 cf::get_slot 0.1, -1, "reload_perl";
3870 info "reloading..."; 3966 info "perl_reload: reloading...";
3871 3967
3872 trace "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3873 3969
3874 cf::sync_job { 3970 cf::sync_job {
3875 cf::emergency_save; 3971 #cf::emergency_save;
3876 3972
3877 trace "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3878 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3879 %EXT_CORO = (); 3975 %EXT_CORO = ();
3880 3976
3881 trace "removing commands"; 3977 trace "perl_reload: removing commands";
3882 %COMMAND = (); 3978 %COMMAND = ();
3883 3979
3884 trace "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3885 %EXTCMD = (); 3981 %EXTCMD = ();
3886 %EXTICMD = (); 3982 %EXTICMD = ();
3887 3983
3888 trace "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3889 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3890 trace "... unloading $pkg"; 3986 trace "... unloading $pkg";
3891 3987
3892 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3893 eval { 3989 eval {
… …
3898 3994
3899 trace "... clearing $pkg"; 3995 trace "... clearing $pkg";
3900 clear_package $pkg; 3996 clear_package $pkg;
3901 } 3997 }
3902 3998
3903 trace "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3904 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3905 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3906 4002
3907 trace "... unloading $k"; 4003 trace "... unloading $k";
3908 delete $INC{$k}; 4004 delete $INC{$k};
… …
3915 } 4011 }
3916 4012
3917 clear_package $k; 4013 clear_package $k;
3918 } 4014 }
3919 4015
3920 trace "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3921 clear_package "safe::$_" 4017 clear_package "safe::$_"
3922 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3923 4019
3924 trace "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3925 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3926 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3927 4023
3928 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3929 # and global variables created in xs 4025 # and global variables created in xs
3930 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3931 4027
3932 info "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3933 4029
3934 trace "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3935 require cf; 4031 require cf;
3936 cf::_connect_to_perl_1; 4032 cf::_connect_to_perl_1;
3937 4033
3938 trace "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3939 cf::reload_config; 4035 cf::reload_config;
3940 4036
3941 trace "loading extensions"; 4037 trace "perl_reload: loading extensions";
3942 cf::load_extensions; 4038 cf::load_extensions;
3943 4039
3944 if ($REATTACH_ON_RELOAD) { 4040 if ($REATTACH_ON_RELOAD) {
3945 trace "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3946 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3947 trace "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3948 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3949 trace "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3950 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
3951 } 4047 }
3952 4048
3953 trace "running post_init jobs"; 4049 cf::_post_init 1;
3954 (pop @POST_INIT)->(1) while @POST_INIT;
3955 4050
3956 trace "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3957 4052
3958 1 4053 1
3959 } or do { 4054 } or do {
3960 error $@; 4055 error $@;
3961 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3962 }; 4057 };
3963 4058
3964 info "reloaded";
3965 --$RELOAD; 4059 --$RELOAD;
3966 } 4060 }
3967 4061
3968 $t1 = AE::time - $t1; 4062 $t1 = AE::time - $t1;
3969 info "reload completed in ${t1}s\n"; 4063 info "perl_reload: completed in ${t1}s\n";
3970}; 4064};
3971 4065
3972our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3973 4067
3974sub reload_perl() { 4068sub reload_perl() {
… …
3995 reload_perl; 4089 reload_perl;
3996 }; 4090 };
3997 } 4091 }
3998}; 4092};
3999 4093
4000unshift @INC, $LIBDIR; 4094#############################################################################
4001 4095
4002my $bug_warning = 0; 4096my $bug_warning = 0;
4003 4097
4004our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
4005our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
4006 4100
4007sub wait_for_tick { 4101sub wait_for_tick() {
4008 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4009 4103
4010 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
4011 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
4012 $signal->wait; 4106 $signal->wait;
4013} 4107}
4014 4108
4015sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
4016 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4017 4111
4018 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
4019 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
4020 $signal->wait; 4114 $signal->wait;
… …
4107 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
4108 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
4109 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
4110} 4204}
4111 4205
4112my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
4113 4208
4114sub _log_backtrace { 4209sub _log_backtrace {
4115 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
4116 4211
4117 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
4118 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4119 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
4120 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
4121 ++$_log_backtrace; 4220 ++$_log_backtrace;
4122 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
4123 async { 4222 async {
4124 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
4125 4224
… …
4145 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
4146 --$_log_backtrace; 4245 --$_log_backtrace;
4147 }; 4246 };
4148 } else { 4247 } else {
4149 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
4150 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4151 } 4250 }
4152} 4251}
4153 4252
4154# load additional modules 4253# load additional modules
4155require "cf/$_.pm" for @EXTRA_MODULES; 4254require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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