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.542 by root, Wed May 5 09:05:03 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";
… …
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 = 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
… …
1869} 1964}
1870 1965
1871sub normalise { 1966sub normalise {
1872 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1873 1968
1874 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1875 1970
1876 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1877 1972
1878 # map plan: 1973 # map plan:
1879 # 1974 #
… …
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
… …
1918 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1919 return $self; 2013 return $self;
1920 } 2014 }
1921 } 2015 }
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;
… …
2051 2150
2052sub find; 2151sub find;
2053sub find { 2152sub find {
2054 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2055 2154
2155 cf::cede_to_tick;
2156
2056 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2057 2158
2058 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2059 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2060 2161
2061 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2092 2193
2093 { 2194 {
2094 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2095 2196
2096 return unless $self->valid; 2197 return unless $self->valid;
2097 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2098
2099 $self->in_memory (cf::MAP_LOADING);
2100 2199
2101 $self->alloc; 2200 $self->alloc;
2102 2201
2103 $self->pre_load; 2202 $self->pre_load;
2104 cf::cede_to_tick; 2203 cf::cede_to_tick;
2105 2204
2205 if (exists $self->{load_path}) {
2106 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2107 $f->skip_block; 2207 $f->skip_block;
2108 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2109 or return; 2209 or return;
2110 2210
2111 $self->post_load_original 2211 $self->post_load_original
2112 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2113 2213
2114 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2115 utf8::encode $uniq; 2215 utf8::encode $uniq;
2116 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2117 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2118 $self->clear_unique_items; 2218 $self->clear_unique_items;
2119 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2120 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2121 } 2222 }
2122 } 2223 }
2123 }
2124 2224
2125 $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);
2126 2232
2127 cf::cede_to_tick; 2233 cf::cede_to_tick;
2128 # now do the right thing for maps 2234 # now do the right thing for maps
2129 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2130 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2133 2239
2134 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2135 $self->decay_objects; 2241 $self->decay_objects;
2136 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2137 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2138 cf::cede_to_tick; 2245 cf::cede_to_tick;
2139 $self->activate; 2246 #$self->activate; # no longer activate maps automatically
2140 } 2247 }
2141 2248
2142 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2143 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2144
2145 $self->in_memory (cf::MAP_ACTIVE);
2146 } 2251 }
2147 2252
2148 $self->post_load; 2253 $self->post_load;
2254
2255 1
2149} 2256}
2150 2257
2151# customize the map for a given player, i.e. 2258# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player 2259# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath 2260# maps to change the path to ~playername/mappath
… …
2191} 2298}
2192 2299
2193sub find_sync { 2300sub find_sync {
2194 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2195 2302
2303 # it's a bug to call this from the main context
2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main; 2305 if $Coro::current == $Coro::main;
2198 2306
2199 find $path, $origin 2307 find $path, $origin
2200} 2308}
2201 2309
2202sub do_load_sync { 2310sub do_load_sync {
2203 my ($map) = @_; 2311 my ($map) = @_;
2204 2312
2313 # it's a bug to call this from the main context
2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2206 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2207 2316
2208 $map->load; 2317 $map->load;
2209} 2318}
… …
2212our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2213 2322
2214sub find_async { 2323sub find_async {
2215 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2216 2325
2217 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2218 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2219 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2220 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2221 } 2332 }
2222 2333
2223 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2224 2335
2225 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
… …
2284sub swap_out { 2395sub swap_out {
2285 my ($self) = @_; 2396 my ($self) = @_;
2286 2397
2287 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288 2399
2289 return if $self->in_memory != cf::MAP_ACTIVE; 2400 return if !$self->linkable;
2290 return if $self->{deny_save}; 2401 return if $self->{deny_save};
2291 return if $self->players; 2402 return if $self->players;
2292 2403
2293 # first deactivate the map and "unlink" it from the core 2404 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate; 2405 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP; 2406 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->in_memory (cf::MAP_SWAPPED); 2407 $self->state (cf::MAP_SWAPPED);
2297 2408
2298 # then atomically save 2409 # then atomically save
2299 $self->_save; 2410 $self->_save;
2300 2411
2301 # then free the map 2412 # then free the map
… …
2327 2438
2328 return if $self->players; 2439 return if $self->players;
2329 2440
2330 cf::trace "resetting map ", $self->path, "\n"; 2441 cf::trace "resetting map ", $self->path, "\n";
2331 2442
2332 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2333 2444
2334 # need to save uniques path 2445 # need to save uniques path
2335 unless ($self->{deny_save}) { 2446 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq; 2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337 2448
… …
2733 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2734 } 2845 }
2735 } 2846 }
2736 2847
2737 my $map = eval { 2848 my $map = eval {
2738 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2739 2850
2740 if ($map) { 2851 if ($map) {
2741 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2742 $map = $check->($map, $x, $y, $self) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2743 } else { 2854 } else {
… …
2833 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2834 2945
2835 unless (eval { 2946 unless (eval {
2836 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2837 2948
2838 # random map handling
2839 {
2840 my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842 prepare_random_map $exit
2843 if $exit->slaying eq "/!";
2844 }
2845
2846 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2847 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2848 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 }
2849 2975
2850 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2851 2977
2852 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2853 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
… …
3357=cut 3483=cut
3358 3484
3359############################################################################# 3485#############################################################################
3360# the server's init and main functions 3486# the server's init and main functions
3361 3487
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3403
3404sub load_facedata($) { 3488sub load_facedata($) {
3405 my ($path) = @_; 3489 my ($path) = @_;
3406 3490
3407 # HACK to clear player env face cache, we need some signal framework 3491 # HACK to clear player env face cache, we need some signal framework
3408 # for this (global event?) 3492 # for this (global event?)
… …
3410 3494
3411 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412 3496
3413 trace "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3414 3498
3415 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3416 0 < aio_load $path, $facedata
3417 or die "$path: $!";
3418
3419 $facedata = Coro::Storable::thaw $facedata;
3420 3500
3421 $facedata->{version} == 2 3501 $facedata->{version} == 2
3422 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3423 3503
3424 # patch in the exptable 3504 # patch in the exptable
… …
3438 3518
3439 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3440 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3442 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} ;
3443 3524
3444 cf::cede_to_tick; 3525 cf::cede_to_tick;
3445 } 3526 }
3446 3527
3447 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
… …
3542} 3623}
3543 3624
3544sub reload_sound { 3625sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n"; 3626 trace "loading sound config from $DATADIR/sound\n";
3546 3627
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551 3629
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_] 3631 my $sound = $soundconf->{compat}[$_]
3554 or next; 3632 or next;
3555 3633
… …
3565} 3643}
3566 3644
3567sub reload_resources { 3645sub reload_resources {
3568 trace "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3569 3647
3648 reload_exp_table;
3649 reload_materials;
3570 reload_facedata; 3650 reload_facedata;
3571 reload_sound; 3651 reload_sound;
3572 reload_archetypes; 3652 reload_archetypes;
3573 reload_regions; 3653 reload_regions;
3574 reload_treasures; 3654 reload_treasures;
… …
3577} 3657}
3578 3658
3579sub reload_config { 3659sub reload_config {
3580 trace "reloading config file...\n"; 3660 trace "reloading config file...\n";
3581 3661
3582 open my $fh, "<:utf8", "$CONFDIR/config" 3662 my $config = load_file "$CONFDIR/config";
3583 or return; 3663 utf8::decode $config;
3584 3664 *CFG = decode_yaml $config;
3585 local $/;
3586 *CFG = YAML::XS::Load scalar <$fh>;
3587 3665
3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3589 3667
3590 $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};
3591 $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};
… …
3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3673 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3596 and die "WARNING: m(un)lockall failed: $!\n"; 3674 and die "WARNING: m(un)lockall failed: $!\n";
3597 }; 3675 };
3598 warn $@ if $@; 3676 warn $@ if $@;
3599 } 3677 }
3600
3601 trace "finished reloading resource files\n";
3602} 3678}
3603 3679
3604sub pidfile() { 3680sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!"; 3682 or die "$PIDFILE: $!";
… …
3631 3707
3632sub main { 3708sub main {
3633 cf::init_globals; # initialise logging 3709 cf::init_globals; # initialise logging
3634 3710
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 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.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639 3715
3640 $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
3641 3717
… …
3649 }; 3725 };
3650 3726
3651 evthread_start IO::AIO::poll_fileno; 3727 evthread_start IO::AIO::poll_fileno;
3652 3728
3653 cf::sync_job { 3729 cf::sync_job {
3654 init_inc; 3730 cf::incloader::init ();
3655 3731
3656 cf::init_experience;
3657 cf::init_anim; 3732 cf::init_anim;
3658 cf::init_attackmess; 3733 cf::init_attackmess;
3659 cf::init_dynamic; 3734 cf::init_dynamic;
3660 3735
3661 cf::load_settings; 3736 cf::load_settings;
3662 cf::load_materials;
3663 3737
3664 reload_resources; 3738 reload_resources;
3665 reload_config; 3739 reload_config;
3666 db_init; 3740 db_init;
3667 3741
… …
3679 3753
3680 # no (long-running) fork's whatsoever before this point(!) 3754 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX (); 3755 use POSIX ();
3682 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};
3683 3757
3684 (pop @POST_INIT)->(0) while @POST_INIT; 3758 cf::_post_init 0;
3685 }; 3759 };
3686 3760
3687 cf::object::thawer::errors_are_fatal 0; 3761 cf::object::thawer::errors_are_fatal 0;
3688 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";
3689 3763
… …
3901 } 3975 }
3902} 3976}
3903 3977
3904sub do_reload_perl() { 3978sub do_reload_perl() {
3905 # can/must only be called in main 3979 # can/must only be called in main
3906 if (in_main) { 3980 unless (in_main) {
3907 error "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3908 return; 3982 return;
3909 } 3983 }
3910 3984
3911 return if $RELOAD++; 3985 return if $RELOAD++;
3912 3986
3913 my $t1 = AE::time; 3987 my $t1 = AE::time;
3914 3988
3915 while ($RELOAD) { 3989 while ($RELOAD) {
3990 cf::get_slot 0.1, -1, "reload_perl";
3916 info "reloading..."; 3991 info "perl_reload: reloading...";
3917 3992
3918 trace "entering sync_job"; 3993 trace "perl_reload: entering sync_job";
3919 3994
3920 cf::sync_job { 3995 cf::sync_job {
3921 cf::emergency_save; 3996 #cf::emergency_save;
3922 3997
3923 trace "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3924 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3925 %EXT_CORO = (); 4000 %EXT_CORO = ();
3926 4001
3927 trace "removing commands"; 4002 trace "perl_reload: removing commands";
3928 %COMMAND = (); 4003 %COMMAND = ();
3929 4004
3930 trace "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3931 %EXTCMD = (); 4006 %EXTCMD = ();
3932 %EXTICMD = (); 4007 %EXTICMD = ();
3933 4008
3934 trace "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3935 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3936 trace "... unloading $pkg"; 4011 trace "... unloading $pkg";
3937 4012
3938 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3939 eval { 4014 eval {
… …
3944 4019
3945 trace "... clearing $pkg"; 4020 trace "... clearing $pkg";
3946 clear_package $pkg; 4021 clear_package $pkg;
3947 } 4022 }
3948 4023
3949 trace "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3950 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3952 4027
3953 trace "... unloading $k"; 4028 trace "... unloading $k";
3954 delete $INC{$k}; 4029 delete $INC{$k};
… …
3961 } 4036 }
3962 4037
3963 clear_package $k; 4038 clear_package $k;
3964 } 4039 }
3965 4040
3966 trace "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3967 clear_package "safe::$_" 4042 clear_package "safe::$_"
3968 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);
3969 4044
3970 trace "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3971 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3973 4048
3974 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3975 # and global variables created in xs 4050 # and global variables created in xs
3976 #clear_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3977 4052
3978 info "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3979 4054
3980 trace "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3981 require cf; 4056 require cf;
3982 cf::_connect_to_perl_1; 4057 cf::_connect_to_perl_1;
3983 4058
3984 trace "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3985 cf::reload_config; 4060 cf::reload_config;
3986 4061
3987 trace "loading extensions"; 4062 trace "perl_reload: loading extensions";
3988 cf::load_extensions; 4063 cf::load_extensions;
3989 4064
3990 if ($REATTACH_ON_RELOAD) { 4065 if ($REATTACH_ON_RELOAD) {
3991 trace "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3992 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3993 trace "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3994 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3995 trace "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3996 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
3997 } 4072 }
3998 4073
3999 trace "running post_init jobs"; 4074 cf::_post_init 1;
4000 (pop @POST_INIT)->(1) while @POST_INIT;
4001 4075
4002 trace "leaving sync_job"; 4076 trace "perl_reload: leaving sync_job";
4003 4077
4004 1 4078 1
4005 } or do { 4079 } or do {
4006 error $@; 4080 error $@;
4007 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
4008 }; 4082 };
4009 4083
4010 info "reloaded";
4011 --$RELOAD; 4084 --$RELOAD;
4012 } 4085 }
4013 4086
4014 $t1 = AE::time - $t1; 4087 $t1 = AE::time - $t1;
4015 info "reload completed in ${t1}s\n"; 4088 info "perl_reload: completed in ${t1}s\n";
4016}; 4089};
4017 4090
4018our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
4019 4092
4020sub reload_perl() { 4093sub reload_perl() {
… …
4045 4118
4046############################################################################# 4119#############################################################################
4047 4120
4048my $bug_warning = 0; 4121my $bug_warning = 0;
4049 4122
4050our @WAIT_FOR_TICK;
4051our @WAIT_FOR_TICK_BEGIN;
4052
4053sub wait_for_tick { 4123sub wait_for_tick() {
4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4055 4125
4056 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
4057 push @WAIT_FOR_TICK, $signal;
4058 $signal->wait;
4059} 4127}
4060 4128
4061sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4063 4131
4064 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
4065 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
4066 $signal->wait; 4134 $signal->wait;
4067} 4135}
… …
4071 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"
4072 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
4073 return; 4141 return;
4074 } 4142 }
4075 4143
4076 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4077 4145
4078 #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#
4079 4147
4080 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4081 $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.;
… …
4087 } 4155 }
4088 4156
4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4090 $sig->send; 4158 $sig->send;
4091 } 4159 }
4092 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
4093 $sig->send;
4094 }
4095 4161
4096 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
4097 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4098 4164
4099 if (0) { 4165 if (0) {
… …
4153 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
4154 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
4155 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
4156} 4222}
4157 4223
4158my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
4159 4226
4160sub _log_backtrace { 4227sub _log_backtrace {
4161 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
4162 4229
4163 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
4164 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4165 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
4166 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
4167 ++$_log_backtrace; 4238 ++$_log_backtrace;
4168 my $perl_bt = Carp::longmess $msg; 4239 my $perl_bt = Carp::longmess $msg;
4169 async { 4240 async {
4170 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
4171 4242
… …
4191 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
4192 --$_log_backtrace; 4263 --$_log_backtrace;
4193 }; 4264 };
4194 } else { 4265 } else {
4195 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
4196 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4197 } 4268 }
4198} 4269}
4199 4270
4200# load additional modules 4271# load additional modules
4201require "cf/$_.pm" for @EXTRA_MODULES; 4272require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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