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

Diff Legend

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