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.547 by root, Sun May 9 22:51:13 2010 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 2012 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,2012 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";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; # unused 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
135our $NOW; 138our $NOW;
136 139
137our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
148 151
149our @POST_INIT; 152our @POST_INIT;
150 153
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
153 159
154binmode STDOUT; 160binmode STDOUT;
155binmode STDERR; 161binmode STDERR;
156 162
157# read virtual server time, if available 163# read virtual server time, if available
… …
191 197
192=over 4 198=over 4
193 199
194=item $cf::UPTIME 200=item $cf::UPTIME
195 201
196The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
197 218
198=item $cf::RUNTIME 219=item $cf::RUNTIME
199 220
200The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 222every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
210database environment. 231database environment.
211 232
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 233=item $cf::LOADAVG
221 234
222The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
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 thread 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.
240 265
241=cut 266=cut
242 267
243sub wait_for_tick(); 268sub wait_for_tick();
244sub wait_for_tick_begin(); 269sub wait_for_tick_begin();
… …
312} 337}
313 338
314$EV::DIED = sub { 339$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
316}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
317 347
318############################################################################# 348#############################################################################
319 349
320=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
321 351
… …
342 $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;
343 $d 373 $d
344 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
345} 375}
346 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
347=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
348 392
349Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
350 394
351=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
357our $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
358 402
359sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
361 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
362=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
363 438
364Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
366 441
367The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
368is a reload or not. 443is a reload or not.
369 444
370=cut 445=cut
371 446
372sub post_init(&) { 447sub post_init(&) {
373 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 }
374} 466}
375 467
376=item cf::lock_wait $string 468=item cf::lock_wait $string
377 469
378Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
431 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
432} 524}
433 525
434=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
435 527
436Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
437This 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
438of 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.
439 535
440The 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
441used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
442 538
443Useful for short background jobs. 539Useful for short background jobs.
… …
472 } 568 }
473 } 569 }
474 570
475 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
476 # 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
477 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
478 $signal->wait;
479 } else { 574 } else {
480 $busy = 0; 575 $busy = 0;
481 Coro::schedule; 576 Coro::schedule;
482 } 577 }
483 } 578 }
… …
583 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
584 679
585 $coro 680 $coro
586} 681}
587 682
588=item fork_call { }, $args 683=item fork_call { }, @args
589 684
590Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
591process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
592Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
593never block itself or use any form of event handling. 688never block itself or use any form of event handling.
… …
606 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
607 702
608 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
609 cf::post_fork; 704 cf::post_fork;
610 &$cb 705 &$cb
611 }, @args; 706 } @args;
612 707
613 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
614} 709}
615 710
616sub objinfo { 711sub objinfo {
… …
738 833
739 my @data; 834 my @data;
740 my $md5; 835 my $md5;
741 836
742 for (0 .. $#$src) { 837 for (0 .. $#$src) {
743 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
744 or Carp::croak "$src->[$_]: $!";
745 } 839 }
746 840
747 # if processing is expensive, check 841 # if processing is expensive, check
748 # checksum first 842 # checksum first
749 if (1) { 843 if (1) {
… …
1367 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1368 1462
1369 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1370 1464
1371 if (ref $msg) { 1465 if (ref $msg) {
1372 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1373 "ARRAY" eq ref $msg
1374 ? @$msg
1375 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1376 1467
1377 my @reply; 1468 my @reply;
1378 1469
1379 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1380 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1483 1574
1484 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1487 } 1578 }
1579
1580 last;
1488 } 1581 }
1489 } 1582 }
1490 }; 1583 };
1491} 1584}
1492 1585
… …
1650 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1651 1744
1652 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1654 1747
1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1656 $pl->deactivate; 1749 $pl->deactivate;
1657 1750
1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1659 ext::highscore::check ($pl->ob); 1753 ext::highscore::check ($pl->ob);
1660 1754
1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1662 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1663 1756
1664 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1665 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1666 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
… …
1832sub generate_random_map { 1925sub generate_random_map {
1833 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1834 1927
1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836 1929
1837 # mit "rum" bekleckern, nicht
1838 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1842 $rmp->{exit_on_final_map},
1843 $rmp->{xsize}, $rmp->{ysize},
1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1846 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1847 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1848 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1849 (cf::region::find $rmp->{region}), $rmp->{custom}
1850 )
1851} 1931}
1852 1932
1853=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1854 1934
1855Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
… …
1906 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1907 $path = "$base/$path"; 1987 $path = "$base/$path";
1908 } 1988 }
1909 1989
1910 for ($path) { 1990 for ($path) {
1911 redo if s{//}{/};
1912 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1913 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1914 } 1993 }
1915 1994
1916 $path 1995 $path
… …
1934 2013
1935 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1936 () 2015 ()
1937} 2016}
1938 2017
2018# may re-bless or do other evil things
1939sub init { 2019sub init {
1940 my ($self) = @_; 2020 my ($self) = @_;
1941 2021
1942 $self 2022 $self
1943} 2023}
… …
2008 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
2009 2089
2010 1 2090 1
2011} 2091}
2012 2092
2093# used to laod the header of an original map
2013sub load_header_orig { 2094sub load_header_orig {
2014 my ($self) = @_; 2095 my ($self) = @_;
2015 2096
2016 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2017} 2098}
2018 2099
2100# used to laod the header of an instantiated map
2019sub load_header_temp { 2101sub load_header_temp {
2020 my ($self) = @_; 2102 my ($self) = @_;
2021 2103
2022 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2023} 2105}
2024 2106
2107# called after loading the header from an instantiated map
2025sub prepare_temp { 2108sub prepare_temp {
2026 my ($self) = @_; 2109 my ($self) = @_;
2027 2110
2028 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2029 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2030 # safety 2113 # safety
2031 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2032 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2033} 2116}
2034 2117
2118# called after loading the header from an original map
2035sub prepare_orig { 2119sub prepare_orig {
2036 my ($self) = @_; 2120 my ($self) = @_;
2037 2121
2038 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2039 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2065sub find { 2149sub find {
2066 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2067 2151
2068 cf::cede_to_tick; 2152 cf::cede_to_tick;
2069 2153
2070 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2071 2155
2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2073 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2074 2158
2075 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2106 2190
2107 { 2191 {
2108 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2109 2193
2110 return unless $self->valid; 2194 return unless $self->valid;
2111 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2112
2113 $self->in_memory (cf::MAP_LOADING);
2114 2196
2115 $self->alloc; 2197 $self->alloc;
2116 2198
2117 $self->pre_load; 2199 $self->pre_load;
2118 cf::cede_to_tick; 2200 cf::cede_to_tick;
2119 2201
2202 if (exists $self->{load_path}) {
2120 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2121 $f->skip_block; 2204 $f->skip_block;
2122 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2123 or return; 2206 or return;
2124 2207
2125 $self->post_load_original 2208 $self->post_load_original
2126 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2127 2210
2128 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2129 utf8::encode $uniq; 2212 utf8::encode $uniq;
2130 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2131 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2132 $self->clear_unique_items; 2215 $self->clear_unique_items;
2133 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2134 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2135 } 2219 }
2136 } 2220 }
2137 }
2138 2221
2139 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2140 2229
2141 cf::cede_to_tick; 2230 cf::cede_to_tick;
2142 # now do the right thing for maps 2231 # now do the right thing for maps
2143 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2144 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2148 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2149 $self->decay_objects; 2238 $self->decay_objects;
2150 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2151 $self->update_buttons; 2240 $self->update_buttons;
2152 cf::cede_to_tick; 2241 cf::cede_to_tick;
2153 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2154 } 2243 }
2155 2244
2156 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2157 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2158
2159 $self->in_memory (cf::MAP_ACTIVE);
2160 } 2247 }
2161 2248
2162 $self->post_load; 2249 $self->post_load;
2250
2251 1
2163} 2252}
2164 2253
2165# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2175# if $self->per_party; 2264# if $self->per_party;
2176 2265
2177 $self 2266 $self
2178} 2267}
2179 2268
2180# find and load all maps in the 3x3 area around a map
2181sub load_neighbours {
2182 my ($map) = @_;
2183
2184 my @neigh; # diagonal neighbours
2185
2186 for (0 .. 3) {
2187 my $neigh = $map->tile_path ($_)
2188 or next;
2189 $neigh = find $neigh, $map
2190 or next;
2191 $neigh->load;
2192
2193 # now find the diagonal neighbours
2194 push @neigh,
2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2197 }
2198
2199 for (grep defined $_->[0], @neigh) {
2200 my ($path, $origin) = @$_;
2201 my $neigh = find $path, $origin
2202 or next;
2203 $neigh->load;
2204 }
2205}
2206
2207sub find_sync { 2269sub find_sync {
2208 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2209 2271
2272 # it's a bug to call this from the main context
2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2212 2275
2213 find $path, $origin 2276 find $path, $origin
2214} 2277}
2215 2278
2216sub do_load_sync { 2279sub do_load_sync {
2217 my ($map) = @_; 2280 my ($map) = @_;
2218 2281
2282 # it's a bug to call this from the main context
2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2220 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2221 2285
2222 $map->load; 2286 $map->load;
2223} 2287}
… …
2226our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2227 2291
2228sub find_async { 2292sub find_async {
2229 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2230 2294
2231 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2232 2296
2233 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2235 } 2299 }
2236 2300
2237 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2238 2302
2239 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2298sub swap_out { 2362sub swap_out {
2299 my ($self) = @_; 2363 my ($self) = @_;
2300 2364
2301 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2302 2366
2303 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2304 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2305 return if $self->players; 2369 return if $self->players;
2306 2370
2307 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate; 2372 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2311 2375
2312 # then atomically save 2376 # then atomically save
2313 $self->_save; 2377 $self->_save;
2314 2378
2315 # then free the map 2379 # then free the map
… …
2341 2405
2342 return if $self->players; 2406 return if $self->players;
2343 2407
2344 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2345 2409
2346 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2347 2411
2348 # need to save uniques path 2412 # need to save uniques path
2349 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351 2415
… …
2681 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2682 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2683 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2684 2748
2685 $map->load; 2749 $map->load;
2686 $map->load_neighbours;
2687 2750
2688 return unless $self->contr->active; 2751 return unless $self->contr->active;
2689 2752
2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2691 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2747 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2748 } 2811 }
2749 } 2812 }
2750 2813
2751 my $map = eval { 2814 my $map = eval {
2752 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2753 2816
2754 if ($map) { 2817 if ($map) {
2755 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2756 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2757 } else { 2820 } else {
… …
2847 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2848 2911
2849 unless (eval { 2912 unless (eval {
2850 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2851 2914
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2861 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2862 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2863 2941
2864 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2865 2943
2866 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3109=cut 3187=cut
3110 3188
3111sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3112 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3113 3191
3114 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3116 } elsif ($self->extcmd == 1) {
3117 #TODO: version 1, remove
3118 unshift @msg, msgtype => "reply", msgid => $id;
3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3120 }
3121} 3195}
3122 3196
3123=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3124 3198
3125Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3180 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3181 3255
3182 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3183 3257
3184 if (ref $msg) { 3258 if (ref $msg) {
3185 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3186 "ARRAY" eq ref $msg
3187 ? @$msg
3188 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3189 3260
3190 my @reply; 3261 my @reply;
3191 3262
3192 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3193 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3382 3453
3383 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3384 3455
3385 trace "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3386 3457
3387 0 < aio_load $path, my $facedata 3458 my $facedata = decode_storable load_file $path;
3388 or die "$path: $!";
3389
3390 $facedata = Coro::Storable::thaw $facedata;
3391 3459
3392 $facedata->{version} == 2 3460 $facedata->{version} == 2
3393 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3394 3462
3395 # patch in the exptable 3463 # patch in the exptable
… …
3409 3477
3410 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3411 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3414 3483
3415 cf::cede_to_tick; 3484 cf::cede_to_tick;
3416 } 3485 }
3417 3486
3418 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3445 3514
3446 { 3515 {
3447 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3448 3517
3449 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3450 if (defined $info->{type}) { 3519 if (defined (my $type = $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3451 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3452 3522
3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3454 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3455 } else { 3526 } else {
3456 $RESOURCE{$name} = $info; # unused 3527# $RESOURCE{$name} = $info; # unused
3457 } 3528 }
3458 3529
3459 cf::cede_to_tick; 3530 cf::cede_to_tick;
3460 } 3531 }
3461 } 3532 }
… …
3513} 3584}
3514 3585
3515sub reload_sound { 3586sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n"; 3587 trace "loading sound config from $DATADIR/sound\n";
3517 3588
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3522 3590
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_] 3592 my $sound = $soundconf->{compat}[$_]
3525 or next; 3593 or next;
3526 3594
… …
3550} 3618}
3551 3619
3552sub reload_config { 3620sub reload_config {
3553 trace "reloading config file...\n"; 3621 trace "reloading config file...\n";
3554 3622
3555 0 < aio_load "$CONFDIR/config", my $config 3623 my $config = load_file "$CONFDIR/config";
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config; 3624 utf8::decode $config;
3559 3625 *CFG = decode_yaml $config;
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3561 *CFG = YAML::XS::Load $config;
3562 3626
3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3564 3628
3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3604 3668
3605sub main { 3669sub main {
3606 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3607 3671
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612 3676
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614 3678
… …
3650 3714
3651 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX (); 3716 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654 3718
3655 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3656 }; 3720 };
3657 3721
3658 cf::object::thawer::errors_are_fatal 0; 3722 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n"; 3723 info "parse errors in files are no longer fatal from this point on.\n";
3660 3724
3661 my $free_main; $free_main = EV::idle sub { 3725 AE::postpone {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :) 3726 undef &main; # free gobs of memory :)
3664 }; 3727 };
3665 3728
3666 goto &main_loop; 3729 goto &main_loop;
3667} 3730}
… …
3824 3887
3825 cf::write_runtime_sync; # external watchdog should not bark 3888 cf::write_runtime_sync; # external watchdog should not bark
3826 3889
3827 trace "emergency_perl_save: flushing outstanding aio requests"; 3890 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) { 3891 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3830 } 3893 }
3831 3894
3832 cf::write_runtime_sync; # external watchdog should not bark 3895 cf::write_runtime_sync; # external watchdog should not bark
3833 }; 3896 };
3834 3897
… …
3883 3946
3884 my $t1 = AE::time; 3947 my $t1 = AE::time;
3885 3948
3886 while ($RELOAD) { 3949 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl"; 3950 cf::get_slot 0.1, -1, "reload_perl";
3888 info "reloading..."; 3951 info "perl_reload: reloading...";
3889 3952
3890 trace "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3891 3954
3892 cf::sync_job { 3955 cf::sync_job {
3893 #cf::emergency_save; 3956 #cf::emergency_save;
3894 3957
3895 trace "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3896 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3897 %EXT_CORO = (); 3960 %EXT_CORO = ();
3898 3961
3899 trace "removing commands"; 3962 trace "perl_reload: removing commands";
3900 %COMMAND = (); 3963 %COMMAND = ();
3901 3964
3902 trace "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3903 %EXTCMD = (); 3966 %EXTCMD = ();
3904 %EXTICMD = (); 3967 %EXTICMD = ();
3905 3968
3906 trace "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3907 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3908 trace "... unloading $pkg"; 3971 trace "... unloading $pkg";
3909 3972
3910 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3911 eval { 3974 eval {
… …
3916 3979
3917 trace "... clearing $pkg"; 3980 trace "... clearing $pkg";
3918 clear_package $pkg; 3981 clear_package $pkg;
3919 } 3982 }
3920 3983
3921 trace "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3922 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3924 3987
3925 trace "... unloading $k"; 3988 trace "... unloading $k";
3926 delete $INC{$k}; 3989 delete $INC{$k};
… …
3933 } 3996 }
3934 3997
3935 clear_package $k; 3998 clear_package $k;
3936 } 3999 }
3937 4000
3938 trace "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3939 clear_package "safe::$_" 4002 clear_package "safe::$_"
3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3941 4004
3942 trace "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3943 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3945 4008
3946 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3947 # and global variables created in xs 4010 # and global variables created in xs
3948 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3949 4012
3950 info "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3951 4014
3952 trace "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3953 require cf; 4016 require cf;
3954 cf::_connect_to_perl_1; 4017 cf::_connect_to_perl_1;
3955 4018
3956 trace "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3957 cf::reload_config; 4020 cf::reload_config;
3958 4021
3959 trace "loading extensions"; 4022 trace "perl_reload: loading extensions";
3960 cf::load_extensions; 4023 cf::load_extensions;
3961 4024
3962 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3963 trace "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3964 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3965 trace "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3966 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3967 trace "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3968 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3969 } 4032 }
3970 4033
3971 trace "running post_init jobs"; 4034 cf::_post_init 1;
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973 4035
3974 trace "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3975 4037
3976 1 4038 1
3977 } or do { 4039 } or do {
3978 error $@; 4040 error $@;
3979 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3980 }; 4042 };
3981 4043
3982 info "reloaded";
3983 --$RELOAD; 4044 --$RELOAD;
3984 } 4045 }
3985 4046
3986 $t1 = AE::time - $t1; 4047 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3988}; 4049};
3989 4050
3990our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3991 4052
3992sub reload_perl() { 4053sub reload_perl() {
… …
4017 4078
4018############################################################################# 4079#############################################################################
4019 4080
4020my $bug_warning = 0; 4081my $bug_warning = 0;
4021 4082
4022our @WAIT_FOR_TICK;
4023our @WAIT_FOR_TICK_BEGIN;
4024
4025sub wait_for_tick() { 4083sub wait_for_tick() {
4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4027 4085
4028 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
4029 push @WAIT_FOR_TICK, $signal;
4030 $signal->wait;
4031} 4087}
4032 4088
4033sub wait_for_tick_begin() { 4089sub wait_for_tick_begin() {
4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4035 4091
4036 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
4037 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
4038 $signal->wait; 4094 $signal->wait;
4039} 4095}
… …
4043 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4044 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
4045 return; 4101 return;
4046 } 4102 }
4047 4103
4048 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4049 4105
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051 4107
4052 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4059 } 4115 }
4060 4116
4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4062 $sig->send; 4118 $sig->send;
4063 } 4119 }
4064 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
4065 $sig->send;
4066 }
4067 4121
4068 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4070 4124
4071 if (0) { 4125 if (0) {
… …
4080{ 4134{
4081 # configure BDB 4135 # configure BDB
4082 4136
4083 BDB::min_parallel 16; 4137 BDB::min_parallel 16;
4084 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
4085 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
4086 4140
4087 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
4088 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4125 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
4126 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
4127 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
4128} 4182}
4129 4183
4130my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
4131 4186
4132sub _log_backtrace { 4187sub _log_backtrace {
4133 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
4134 4189
4135 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
4136 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4137 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
4138 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
4139 ++$_log_backtrace; 4198 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
4141 async { 4200 async {
4142 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
4143 4202
… …
4163 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4164 --$_log_backtrace; 4223 --$_log_backtrace;
4165 }; 4224 };
4166 } else { 4225 } else {
4167 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4168 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4169 } 4228 }
4170} 4229}
4171 4230
4172# load additional modules 4231# load additional modules
4173require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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