ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.544 by root, Thu May 6 21:58:07 2010 UTC vs.
Revision 1.578 by root, Wed Jan 4 02:48:57 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.
… …
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) {
… …
1358 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1359 1462
1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361 1464
1362 if (ref $msg) { 1465 if (ref $msg) {
1363 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364 "ARRAY" eq ref $msg
1365 ? @$msg
1366 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367 1467
1368 my @reply; 1468 my @reply;
1369 1469
1370 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1371 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1474 1574
1475 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1478 } 1578 }
1579
1580 last;
1479 } 1581 }
1480 } 1582 }
1481 }; 1583 };
1482} 1584}
1483 1585
… …
1641 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1642 1744
1643 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1644 $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
1645 1747
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1749 $pl->deactivate;
1750
1648 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;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1650 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1651 1756
1652 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1925sub generate_random_map {
1821 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1822 1927
1823 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
1824 1929
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1931}
1840 1932
1841=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1842 1934
1843Register 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
… …
1894 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1895 $path = "$base/$path"; 1987 $path = "$base/$path";
1896 } 1988 }
1897 1989
1898 for ($path) { 1990 for ($path) {
1899 redo if s{//}{/};
1900 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1901 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1902 } 1993 }
1903 1994
1904 $path 1995 $path
… …
1922 2013
1923 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1924 () 2015 ()
1925} 2016}
1926 2017
2018# may re-bless or do other evil things
1927sub init { 2019sub init {
1928 my ($self) = @_; 2020 my ($self) = @_;
1929 2021
1930 $self 2022 $self
1931} 2023}
… …
1996 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1997 2089
1998 1 2090 1
1999} 2091}
2000 2092
2093# used to laod the header of an original map
2001sub load_header_orig { 2094sub load_header_orig {
2002 my ($self) = @_; 2095 my ($self) = @_;
2003 2096
2004 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2005} 2098}
2006 2099
2100# used to laod the header of an instantiated map
2007sub load_header_temp { 2101sub load_header_temp {
2008 my ($self) = @_; 2102 my ($self) = @_;
2009 2103
2010 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2011} 2105}
2012 2106
2107# called after loading the header from an instantiated map
2013sub prepare_temp { 2108sub prepare_temp {
2014 my ($self) = @_; 2109 my ($self) = @_;
2015 2110
2016 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2017 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2018 # safety 2113 # safety
2019 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2020 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2021} 2116}
2022 2117
2118# called after loading the header from an original map
2023sub prepare_orig { 2119sub prepare_orig {
2024 my ($self) = @_; 2120 my ($self) = @_;
2025 2121
2026 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2027 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2053sub find { 2149sub find {
2054 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2055 2151
2056 cf::cede_to_tick; 2152 cf::cede_to_tick;
2057 2153
2058 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2059 2155
2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2062 2158
2063 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2094 2190
2095 { 2191 {
2096 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2097 2193
2098 return unless $self->valid; 2194 return unless $self->valid;
2099 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2100
2101 $self->in_memory (cf::MAP_LOADING);
2102 2196
2103 $self->alloc; 2197 $self->alloc;
2104 2198
2105 $self->pre_load; 2199 $self->pre_load;
2106 cf::cede_to_tick; 2200 cf::cede_to_tick;
2107 2201
2202 if (exists $self->{load_path}) {
2108 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2109 $f->skip_block; 2204 $f->skip_block;
2110 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2111 or return; 2206 or return;
2112 2207
2113 $self->post_load_original 2208 $self->post_load_original
2114 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2115 2210
2116 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2117 utf8::encode $uniq; 2212 utf8::encode $uniq;
2118 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2119 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2120 $self->clear_unique_items; 2215 $self->clear_unique_items;
2121 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2122 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2123 } 2219 }
2124 } 2220 }
2125 }
2126 2221
2127 $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);
2128 2229
2129 cf::cede_to_tick; 2230 cf::cede_to_tick;
2130 # now do the right thing for maps 2231 # now do the right thing for maps
2131 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2132 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2136 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2137 $self->decay_objects; 2238 $self->decay_objects;
2138 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2139 $self->update_buttons; 2240 $self->update_buttons;
2140 cf::cede_to_tick; 2241 cf::cede_to_tick;
2141 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2142 } 2243 }
2143 2244
2144 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2145 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2146
2147 $self->in_memory (cf::MAP_ACTIVE);
2148 } 2247 }
2149 2248
2150 $self->post_load; 2249 $self->post_load;
2250
2251 1
2151} 2252}
2152 2253
2153# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2163# if $self->per_party; 2264# if $self->per_party;
2164 2265
2165 $self 2266 $self
2166} 2267}
2167 2268
2168# find and load all maps in the 3x3 area around a map
2169sub load_neighbours {
2170 my ($map) = @_;
2171
2172 my @neigh; # diagonal neighbours
2173
2174 for (0 .. 3) {
2175 my $neigh = $map->tile_path ($_)
2176 or next;
2177 $neigh = find $neigh, $map
2178 or next;
2179 $neigh->load;
2180
2181 # now find the diagonal neighbours
2182 push @neigh,
2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2185 }
2186
2187 for (grep defined $_->[0], @neigh) {
2188 my ($path, $origin) = @$_;
2189 my $neigh = find $path, $origin
2190 or next;
2191 $neigh->load;
2192 }
2193}
2194
2195sub find_sync { 2269sub find_sync {
2196 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2197 2271
2272 # it's a bug to call this from the main context
2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2200 2275
2201 find $path, $origin 2276 find $path, $origin
2202} 2277}
2203 2278
2204sub do_load_sync { 2279sub do_load_sync {
2205 my ($map) = @_; 2280 my ($map) = @_;
2206 2281
2282 # it's a bug to call this from the main context
2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2208 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2209 2285
2210 $map->load; 2286 $map->load;
2211} 2287}
… …
2214our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2215 2291
2216sub find_async { 2292sub find_async {
2217 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2218 2294
2219 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2220 2296
2221 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2222 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2223 } 2299 }
2224 2300
2225 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2226 2302
2227 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2286sub swap_out { 2362sub swap_out {
2287 my ($self) = @_; 2363 my ($self) = @_;
2288 2364
2289 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290 2366
2291 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2292 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2293 return if $self->players; 2369 return if $self->players;
2294 2370
2295 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate; 2372 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2299 2375
2300 # then atomically save 2376 # then atomically save
2301 $self->_save; 2377 $self->_save;
2302 2378
2303 # then free the map 2379 # then free the map
… …
2329 2405
2330 return if $self->players; 2406 return if $self->players;
2331 2407
2332 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2333 2409
2334 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2335 2411
2336 # need to save uniques path 2412 # need to save uniques path
2337 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2338 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2339 2415
… …
2669 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2670 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2671 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2672 2748
2673 $map->load; 2749 $map->load;
2674 $map->load_neighbours;
2675 2750
2676 return unless $self->contr->active; 2751 return unless $self->contr->active;
2677 2752
2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2679 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2735 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2736 } 2811 }
2737 } 2812 }
2738 2813
2739 my $map = eval { 2814 my $map = eval {
2740 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2741 2816
2742 if ($map) { 2817 if ($map) {
2743 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2744 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2745 } else { 2820 } else {
… …
2835 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2836 2911
2837 unless (eval { 2912 unless (eval {
2838 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2839 2914
2840 # random map handling
2841 {
2842 my $guard = cf::lock_acquire "exit_prepare:$exit";
2843
2844 prepare_random_map $exit
2845 if $exit->slaying eq "/!";
2846 }
2847
2848 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2849 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2850 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 }
2851 2941
2852 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2853 2943
2854 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2855 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3097=cut 3187=cut
3098 3188
3099sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3100 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3101 3191
3102 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3103 $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]));
3104 } elsif ($self->extcmd == 1) {
3105 #TODO: version 1, remove
3106 unshift @msg, msgtype => "reply", msgid => $id;
3107 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3108 }
3109} 3195}
3110 3196
3111=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3112 3198
3113Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3168 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3169 3255
3170 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3171 3257
3172 if (ref $msg) { 3258 if (ref $msg) {
3173 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3174 "ARRAY" eq ref $msg
3175 ? @$msg
3176 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3177 3260
3178 my @reply; 3261 my @reply;
3179 3262
3180 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3181 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3370 3453
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3455
3373 trace "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3374 3457
3375 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3459
3381 $facedata->{version} == 2 3460 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3462
3384 # patch in the exptable 3463 # patch in the exptable
… …
3398 3477
3399 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 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} ;
3403 3483
3404 cf::cede_to_tick; 3484 cf::cede_to_tick;
3405 } 3485 }
3406 3486
3407 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3434 3514
3435 { 3515 {
3436 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3437 3517
3438 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) { 3519 if (defined (my $type = delete $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3440 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441 3522
3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3523 cf::face::set_data $idx, 0, delete $info->{data}, delete $info->{hash};
3443 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, (keys %$info && (~$type & 1)) ? $info : undef; # any keys left are stashed into meta unless prepended
3444 } else { 3526 } else {
3445 $RESOURCE{$name} = $info; # unused 3527# $RESOURCE{$name} = $info; # unused
3446 } 3528 }
3447 3529
3448 cf::cede_to_tick; 3530 cf::cede_to_tick;
3449 } 3531 }
3450 } 3532 }
… …
3499sub reload_treasures { 3581sub reload_treasures {
3500 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
3501 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
3502} 3584}
3503 3585
3504sub reload_exp {
3505 cf::init_experience;
3506}
3507
3508sub reload_sound { 3586sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n"; 3587 trace "loading sound config from $DATADIR/sound\n";
3510 3588
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3515 3590
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_] 3592 my $sound = $soundconf->{compat}[$_]
3518 or next; 3593 or next;
3519 3594
… …
3529} 3604}
3530 3605
3531sub reload_resources { 3606sub reload_resources {
3532 trace "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3533 3608
3534 reload_exp; 3609 reload_exp_table;
3610 reload_materials;
3535 reload_facedata; 3611 reload_facedata;
3536 reload_sound; 3612 reload_sound;
3537 reload_archetypes; 3613 reload_archetypes;
3538 reload_regions; 3614 reload_regions;
3539 reload_treasures; 3615 reload_treasures;
… …
3542} 3618}
3543 3619
3544sub reload_config { 3620sub reload_config {
3545 trace "reloading config file...\n"; 3621 trace "reloading config file...\n";
3546 3622
3547 open my $fh, "<:utf8", "$CONFDIR/config" 3623 my $config = load_file "$CONFDIR/config";
3548 or return; 3624 utf8::decode $config;
3549 3625 *CFG = decode_yaml $config;
3550 local $/;
3551 *CFG = YAML::XS::Load scalar <$fh>;
3552 3626
3553 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3554 3628
3555 $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};
3556 $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};
… …
3560 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3634 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3561 and die "WARNING: m(un)lockall failed: $!\n"; 3635 and die "WARNING: m(un)lockall failed: $!\n";
3562 }; 3636 };
3563 warn $@ if $@; 3637 warn $@ if $@;
3564 } 3638 }
3565
3566 trace "finished reloading resource files\n";
3567} 3639}
3568 3640
3569sub pidfile() { 3641sub pidfile() {
3570 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3642 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3571 or die "$PIDFILE: $!"; 3643 or die "$PIDFILE: $!";
… …
3596 3668
3597sub main { 3669sub main {
3598 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3599 3671
3600 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3601 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.";
3602 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3603 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3604 3676
3605 $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
3606 3678
… …
3621 cf::init_anim; 3693 cf::init_anim;
3622 cf::init_attackmess; 3694 cf::init_attackmess;
3623 cf::init_dynamic; 3695 cf::init_dynamic;
3624 3696
3625 cf::load_settings; 3697 cf::load_settings;
3626 cf::load_materials;
3627 3698
3628 reload_resources; 3699 reload_resources;
3629 reload_config; 3700 reload_config;
3630 db_init; 3701 db_init;
3631 3702
… …
3643 3714
3644 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX (); 3716 use POSIX ();
3646 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};
3647 3718
3648 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3649 }; 3720 };
3650 3721
3651 cf::object::thawer::errors_are_fatal 0; 3722 cf::object::thawer::errors_are_fatal 0;
3652 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";
3653 3724
3654 my $free_main; $free_main = EV::idle sub { 3725 AE::postpone {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :) 3726 undef &main; # free gobs of memory :)
3657 }; 3727 };
3658 3728
3659 goto &main_loop; 3729 goto &main_loop;
3660} 3730}
… …
3817 3887
3818 cf::write_runtime_sync; # external watchdog should not bark 3888 cf::write_runtime_sync; # external watchdog should not bark
3819 3889
3820 trace "emergency_perl_save: flushing outstanding aio requests"; 3890 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) { 3891 while (IO::AIO::nreqs || BDB::nreqs) {
3822 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
3823 } 3893 }
3824 3894
3825 cf::write_runtime_sync; # external watchdog should not bark 3895 cf::write_runtime_sync; # external watchdog should not bark
3826 }; 3896 };
3827 3897
… …
3876 3946
3877 my $t1 = AE::time; 3947 my $t1 = AE::time;
3878 3948
3879 while ($RELOAD) { 3949 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl"; 3950 cf::get_slot 0.1, -1, "reload_perl";
3881 info "reloading..."; 3951 info "perl_reload: reloading...";
3882 3952
3883 trace "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3884 3954
3885 cf::sync_job { 3955 cf::sync_job {
3886 #cf::emergency_save; 3956 #cf::emergency_save;
3887 3957
3888 trace "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3889 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3890 %EXT_CORO = (); 3960 %EXT_CORO = ();
3891 3961
3892 trace "removing commands"; 3962 trace "perl_reload: removing commands";
3893 %COMMAND = (); 3963 %COMMAND = ();
3894 3964
3895 trace "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3896 %EXTCMD = (); 3966 %EXTCMD = ();
3897 %EXTICMD = (); 3967 %EXTICMD = ();
3898 3968
3899 trace "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3900 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3901 trace "... unloading $pkg"; 3971 trace "... unloading $pkg";
3902 3972
3903 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3904 eval { 3974 eval {
… …
3909 3979
3910 trace "... clearing $pkg"; 3980 trace "... clearing $pkg";
3911 clear_package $pkg; 3981 clear_package $pkg;
3912 } 3982 }
3913 3983
3914 trace "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3915 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3917 3987
3918 trace "... unloading $k"; 3988 trace "... unloading $k";
3919 delete $INC{$k}; 3989 delete $INC{$k};
… …
3926 } 3996 }
3927 3997
3928 clear_package $k; 3998 clear_package $k;
3929 } 3999 }
3930 4000
3931 trace "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3932 clear_package "safe::$_" 4002 clear_package "safe::$_"
3933 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);
3934 4004
3935 trace "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3936 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3938 4008
3939 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3940 # and global variables created in xs 4010 # and global variables created in xs
3941 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3942 4012
3943 info "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3944 4014
3945 trace "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3946 require cf; 4016 require cf;
3947 cf::_connect_to_perl_1; 4017 cf::_connect_to_perl_1;
3948 4018
3949 trace "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3950 cf::reload_config; 4020 cf::reload_config;
3951 4021
3952 trace "loading extensions"; 4022 trace "perl_reload: loading extensions";
3953 cf::load_extensions; 4023 cf::load_extensions;
3954 4024
3955 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3956 trace "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3957 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3958 trace "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3959 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3960 trace "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3961 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3962 } 4032 }
3963 4033
3964 trace "running post_init jobs"; 4034 cf::_post_init 1;
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966 4035
3967 trace "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3968 4037
3969 1 4038 1
3970 } or do { 4039 } or do {
3971 error $@; 4040 error $@;
3972 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3973 }; 4042 };
3974 4043
3975 info "reloaded";
3976 --$RELOAD; 4044 --$RELOAD;
3977 } 4045 }
3978 4046
3979 $t1 = AE::time - $t1; 4047 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3981}; 4049};
3982 4050
3983our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3984 4052
3985sub reload_perl() { 4053sub reload_perl() {
… …
4010 4078
4011############################################################################# 4079#############################################################################
4012 4080
4013my $bug_warning = 0; 4081my $bug_warning = 0;
4014 4082
4015our @WAIT_FOR_TICK;
4016our @WAIT_FOR_TICK_BEGIN;
4017
4018sub wait_for_tick { 4083sub wait_for_tick() {
4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4020 4085
4021 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
4022 push @WAIT_FOR_TICK, $signal;
4023 $signal->wait;
4024} 4087}
4025 4088
4026sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4028 4091
4029 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
4030 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
4031 $signal->wait; 4094 $signal->wait;
4032} 4095}
… …
4036 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"
4037 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
4038 return; 4101 return;
4039 } 4102 }
4040 4103
4041 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4042 4105
4043 #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#
4044 4107
4045 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4046 $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.;
… …
4052 } 4115 }
4053 4116
4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4055 $sig->send; 4118 $sig->send;
4056 } 4119 }
4057 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
4058 $sig->send;
4059 }
4060 4121
4061 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
4062 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4063 4124
4064 if (0) { 4125 if (0) {
… …
4073{ 4134{
4074 # configure BDB 4135 # configure BDB
4075 4136
4076 BDB::min_parallel 16; 4137 BDB::min_parallel 16;
4077 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
4078 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
4079 4140
4080 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
4081 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4082 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4083 $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;
… …
4118 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
4119 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
4120 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
4121} 4182}
4122 4183
4123my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
4124 4186
4125sub _log_backtrace { 4187sub _log_backtrace {
4126 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
4127 4189
4128 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
4129 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4130 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
4131 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
4132 ++$_log_backtrace; 4198 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
4134 async { 4200 async {
4135 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
4136 4202
… …
4156 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4157 --$_log_backtrace; 4223 --$_log_backtrace;
4158 }; 4224 };
4159 } else { 4225 } else {
4160 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4161 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4162 } 4228 }
4163} 4229}
4164 4230
4165# load additional modules 4231# load additional modules
4166require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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