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.539 by root, Tue May 4 22:49:21 2010 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 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 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.
… …
76# strictly for debugging 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78 78
79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80 80
81our @ORIG_INC;
82
81our %COMMAND = (); 83our %COMMAND = ();
82our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
83 85
84our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXTCMD = (); 87our %EXTCMD = ();
… …
91our @EVENT; 93our @EVENT;
92our @REFLECT; # set by XS 94our @REFLECT; # set by XS
93our %REFLECT; # set by us 95our %REFLECT; # set by us
94 96
95our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
96our $DATADIR = datadir; 99our $DATADIR = datadir;
97our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
98our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
99our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
100our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
101our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
102our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
103our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
104our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
122our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
123our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
124our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
125our $DB_ENV; 129our $DB_ENV;
126 130
127our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
128 132
129our %CFG; 133our %CFG;
130 134
131our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
132our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
133our $NOW; 138our $NOW;
134 139
135our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
136our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
137our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
146 151
147our @POST_INIT; 152our @POST_INIT;
148 153
149our $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)
150our $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;
151 159
152binmode STDOUT; 160binmode STDOUT;
153binmode STDERR; 161binmode STDERR;
154 162
155# read virtual server time, if available 163# read virtual server time, if available
… …
189 197
190=over 4 198=over 4
191 199
192=item $cf::UPTIME 200=item $cf::UPTIME
193 201
194The 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.
195 218
196=item $cf::RUNTIME 219=item $cf::RUNTIME
197 220
198The 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
199every server tick. 222every server tick.
… …
205Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
206directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
207unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
208database environment. 231database environment.
209 232
210=item $cf::NOW
211
212The time of the last (current) server tick.
213
214=item $cf::TICK
215
216The interval between server ticks, in seconds.
217
218=item $cf::LOADAVG 233=item $cf::LOADAVG
219 234
220The 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
221(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
222objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
231from wherever your confdir points to. 246from wherever your confdir points to.
232 247
233=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
234 249
235These 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
236returns 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
237per 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();
238 270
239=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
240 272
241This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
242C<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
… …
305} 337}
306 338
307$EV::DIED = sub { 339$EV::DIED = sub {
308 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
309}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
310 347
311############################################################################# 348#############################################################################
312 349
313=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
314 351
… …
335 $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;
336 $d 373 $d
337 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
338} 375}
339 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
340=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
341 392
342Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
343 394
344=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
350our $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
351 402
352sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
353sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
354 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
355=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
356 438
357Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
358but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
359 441
360The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
361is a reload or not. 443is a reload or not.
362 444
363=cut 445=cut
364 446
365sub post_init(&) { 447sub post_init(&) {
366 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 }
367} 466}
368 467
369=item cf::lock_wait $string 468=item cf::lock_wait $string
370 469
371Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
424 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
425} 524}
426 525
427=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
428 527
429Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
430This 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
431of 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.
432 535
433The 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
434used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
435 538
436Useful for short background jobs. 539Useful for short background jobs.
… …
465 } 568 }
466 } 569 }
467 570
468 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
469 # 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
470 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
471 $signal->wait;
472 } else { 574 } else {
473 $busy = 0; 575 $busy = 0;
474 Coro::schedule; 576 Coro::schedule;
475 } 577 }
476 } 578 }
… …
576 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
577 679
578 $coro 680 $coro
579} 681}
580 682
581=item fork_call { }, $args 683=item fork_call { }, @args
582 684
583Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
584process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
585Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
586never block itself or use any form of event handling. 688never block itself or use any form of event handling.
587 689
588=cut 690=cut
589 691
692sub post_fork {
693 reset_signals;
694}
695
590sub fork_call(&@) { 696sub fork_call(&@) {
591 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
592 698
593 # 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,
594 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
595 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
596 702
597 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
598 reset_signals; 704 cf::post_fork;
599 &$cb 705 &$cb
600 }, @args; 706 } @args;
601 707
602 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
603} 709}
604 710
605sub objinfo { 711sub objinfo {
… …
727 833
728 my @data; 834 my @data;
729 my $md5; 835 my $md5;
730 836
731 for (0 .. $#$src) { 837 for (0 .. $#$src) {
732 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
733 or Carp::croak "$src->[$_]: $!";
734 } 839 }
735 840
736 # if processing is expensive, check 841 # if processing is expensive, check
737 # checksum first 842 # checksum first
738 if (1) { 843 if (1) {
… …
1356 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1357 1462
1358 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1359 1464
1360 if (ref $msg) { 1465 if (ref $msg) {
1361 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1362 "ARRAY" eq ref $msg
1363 ? @$msg
1364 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1365 1467
1366 my @reply; 1468 my @reply;
1367 1469
1368 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1369 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1449 1551
1450 my $active = eval $v->{source}; 1552 my $active = eval $v->{source};
1451 1553
1452 if (length $@) { 1554 if (length $@) {
1453 error "$v->{path}: $@\n"; 1555 error "$v->{path}: $@\n";
1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1455 1556
1456 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1457 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1458 1559
1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1473 1574
1474 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1475 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1477 } 1578 }
1579
1580 last;
1478 } 1581 }
1479 } 1582 }
1480 }; 1583 };
1481} 1584}
1482 1585
… …
1640 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1641 1744
1642 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1643 $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
1644 1747
1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1646 $pl->deactivate; 1749 $pl->deactivate;
1750
1647 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;
1648 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1649 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1650 1756
1651 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1652 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1653 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
… …
1819sub generate_random_map { 1925sub generate_random_map {
1820 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1821 1927
1822 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
1823 1929
1824 # mit "rum" bekleckern, nicht
1825 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1829 $rmp->{exit_on_final_map},
1830 $rmp->{xsize}, $rmp->{ysize},
1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1833 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1834 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1835 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1836 (cf::region::find $rmp->{region}), $rmp->{custom}
1837 )
1838} 1931}
1839 1932
1840=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1841 1934
1842Register 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
… …
1868} 1961}
1869 1962
1870sub normalise { 1963sub normalise {
1871 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1872 1965
1873 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1874 1967
1875 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1876 1969
1877 # map plan: 1970 # map plan:
1878 # 1971 #
… …
1893 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1894 $path = "$base/$path"; 1987 $path = "$base/$path";
1895 } 1988 }
1896 1989
1897 for ($path) { 1990 for ($path) {
1898 redo if s{//}{/};
1899 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1900 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1901 } 1993 }
1902 1994
1903 $path 1995 $path
… …
1917 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1918 return $self; 2010 return $self;
1919 } 2011 }
1920 } 2012 }
1921 2013
1922 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1923 () 2015 ()
1924} 2016}
1925 2017
2018# may re-bless or do other evil things
1926sub init { 2019sub init {
1927 my ($self) = @_; 2020 my ($self) = @_;
1928 2021
1929 $self 2022 $self
1930} 2023}
… …
1995 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1996 2089
1997 1 2090 1
1998} 2091}
1999 2092
2093# used to laod the header of an original map
2000sub load_header_orig { 2094sub load_header_orig {
2001 my ($self) = @_; 2095 my ($self) = @_;
2002 2096
2003 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
2004} 2098}
2005 2099
2100# used to laod the header of an instantiated map
2006sub load_header_temp { 2101sub load_header_temp {
2007 my ($self) = @_; 2102 my ($self) = @_;
2008 2103
2009 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
2010} 2105}
2011 2106
2107# called after loading the header from an instantiated map
2012sub prepare_temp { 2108sub prepare_temp {
2013 my ($self) = @_; 2109 my ($self) = @_;
2014 2110
2015 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
2016 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
2017 # safety 2113 # safety
2018 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2019 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2020} 2116}
2021 2117
2118# called after loading the header from an original map
2022sub prepare_orig { 2119sub prepare_orig {
2023 my ($self) = @_; 2120 my ($self) = @_;
2024 2121
2025 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2026 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2050 2147
2051sub find; 2148sub find;
2052sub find { 2149sub find {
2053 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2054 2151
2152 cf::cede_to_tick;
2153
2055 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2056 2155
2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2059 2158
2060 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2091 2190
2092 { 2191 {
2093 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2094 2193
2095 return unless $self->valid; 2194 return unless $self->valid;
2096 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2097
2098 $self->in_memory (cf::MAP_LOADING);
2099 2196
2100 $self->alloc; 2197 $self->alloc;
2101 2198
2102 $self->pre_load; 2199 $self->pre_load;
2103 cf::cede_to_tick; 2200 cf::cede_to_tick;
2104 2201
2202 if (exists $self->{load_path}) {
2105 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2106 $f->skip_block; 2204 $f->skip_block;
2107 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2108 or return; 2206 or return;
2109 2207
2110 $self->post_load_original 2208 $self->post_load_original
2111 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2112 2210
2113 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2114 utf8::encode $uniq; 2212 utf8::encode $uniq;
2115 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2116 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2117 $self->clear_unique_items; 2215 $self->clear_unique_items;
2118 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2119 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2120 } 2219 }
2121 } 2220 }
2122 }
2123 2221
2124 $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);
2125 2229
2126 cf::cede_to_tick; 2230 cf::cede_to_tick;
2127 # now do the right thing for maps 2231 # now do the right thing for maps
2128 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2129 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2133 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2134 $self->decay_objects; 2238 $self->decay_objects;
2135 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2136 $self->update_buttons; 2240 $self->update_buttons;
2137 cf::cede_to_tick; 2241 cf::cede_to_tick;
2138 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2139 } 2243 }
2140 2244
2141 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2142 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2143
2144 $self->in_memory (cf::MAP_ACTIVE);
2145 } 2247 }
2146 2248
2147 $self->post_load; 2249 $self->post_load;
2250
2251 1
2148} 2252}
2149 2253
2150# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2160# if $self->per_party; 2264# if $self->per_party;
2161 2265
2162 $self 2266 $self
2163} 2267}
2164 2268
2165# find and load all maps in the 3x3 area around a map
2166sub load_neighbours {
2167 my ($map) = @_;
2168
2169 my @neigh; # diagonal neighbours
2170
2171 for (0 .. 3) {
2172 my $neigh = $map->tile_path ($_)
2173 or next;
2174 $neigh = find $neigh, $map
2175 or next;
2176 $neigh->load;
2177
2178 # now find the diagonal neighbours
2179 push @neigh,
2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2182 }
2183
2184 for (grep defined $_->[0], @neigh) {
2185 my ($path, $origin) = @$_;
2186 my $neigh = find $path, $origin
2187 or next;
2188 $neigh->load;
2189 }
2190}
2191
2192sub find_sync { 2269sub find_sync {
2193 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2194 2271
2272 # it's a bug to call this from the main context
2195 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196 if $Coro::current == $Coro::main; 2274 if $Coro::current == $Coro::main;
2197 2275
2198 find $path, $origin 2276 find $path, $origin
2199} 2277}
2200 2278
2201sub do_load_sync { 2279sub do_load_sync {
2202 my ($map) = @_; 2280 my ($map) = @_;
2203 2281
2282 # it's a bug to call this from the main context
2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2205 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2206 2285
2207 $map->load; 2286 $map->load;
2208} 2287}
… …
2211our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2212 2291
2213sub find_async { 2292sub find_async {
2214 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2215 2294
2216 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2217 2296
2218 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2219 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2220 } 2299 }
2221 2300
2222 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2223 2302
2224 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2283sub swap_out { 2362sub swap_out {
2284 my ($self) = @_; 2363 my ($self) = @_;
2285 2364
2286 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287 2366
2288 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2289 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2290 return if $self->players; 2369 return if $self->players;
2291 2370
2292 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate; 2372 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2295 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2296 2375
2297 # then atomically save 2376 # then atomically save
2298 $self->_save; 2377 $self->_save;
2299 2378
2300 # then free the map 2379 # then free the map
… …
2326 2405
2327 return if $self->players; 2406 return if $self->players;
2328 2407
2329 cf::trace "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2330 2409
2331 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2332 2411
2333 # need to save uniques path 2412 # need to save uniques path
2334 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2335 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2336 2415
… …
2666 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2667 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2668 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2669 2748
2670 $map->load; 2749 $map->load;
2671 $map->load_neighbours;
2672 2750
2673 return unless $self->contr->active; 2751 return unless $self->contr->active;
2674 2752
2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2676 if ($self->enter_map ($map, $x, $y)) { 2754 if ($self->enter_map ($map, $x, $y)) {
… …
2732 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2733 } 2811 }
2734 } 2812 }
2735 2813
2736 my $map = eval { 2814 my $map = eval {
2737 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2738 2816
2739 if ($map) { 2817 if ($map) {
2740 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2741 $map = $check->($map, $x, $y, $self) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2742 } else { 2820 } else {
… …
2832 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2833 2911
2834 unless (eval { 2912 unless (eval {
2835 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2836 2914
2837 # random map handling
2838 {
2839 my $guard = cf::lock_acquire "exit_prepare:$exit";
2840
2841 prepare_random_map $exit
2842 if $exit->slaying eq "/!";
2843 }
2844
2845 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2846 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2847 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 }
2848 2941
2849 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2850 2943
2851 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2852 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
3094=cut 3187=cut
3095 3188
3096sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3097 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3098 3191
3099 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3100 $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]));
3101 } elsif ($self->extcmd == 1) {
3102 #TODO: version 1, remove
3103 unshift @msg, msgtype => "reply", msgid => $id;
3104 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3105 }
3106} 3195}
3107 3196
3108=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3109 3198
3110Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3165 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3166 3255
3167 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3168 3257
3169 if (ref $msg) { 3258 if (ref $msg) {
3170 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3171 "ARRAY" eq ref $msg
3172 ? @$msg
3173 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3174 3260
3175 my @reply; 3261 my @reply;
3176 3262
3177 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3178 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3367 3453
3368 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3369 3455
3370 trace "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3371 3457
3372 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3373 0 < aio_load $path, $facedata
3374 or die "$path: $!";
3375
3376 $facedata = Coro::Storable::thaw $facedata;
3377 3459
3378 $facedata->{version} == 2 3460 $facedata->{version} == 2
3379 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3380 3462
3381 # patch in the exptable 3463 # patch in the exptable
… …
3395 3477
3396 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3397 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3399 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} ;
3400 3483
3401 cf::cede_to_tick; 3484 cf::cede_to_tick;
3402 } 3485 }
3403 3486
3404 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3499} 3582}
3500 3583
3501sub reload_sound { 3584sub reload_sound {
3502 trace "loading sound config from $DATADIR/sound\n"; 3585 trace "loading sound config from $DATADIR/sound\n";
3503 3586
3504 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505 or die "$DATADIR/sound $!";
3506
3507 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3508 3588
3509 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510 my $sound = $soundconf->{compat}[$_] 3590 my $sound = $soundconf->{compat}[$_]
3511 or next; 3591 or next;
3512 3592
… …
3522} 3602}
3523 3603
3524sub reload_resources { 3604sub reload_resources {
3525 trace "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3526 3606
3607 reload_exp_table;
3608 reload_materials;
3527 reload_facedata; 3609 reload_facedata;
3528 reload_sound; 3610 reload_sound;
3529 reload_archetypes; 3611 reload_archetypes;
3530 reload_regions; 3612 reload_regions;
3531 reload_treasures; 3613 reload_treasures;
… …
3534} 3616}
3535 3617
3536sub reload_config { 3618sub reload_config {
3537 trace "reloading config file...\n"; 3619 trace "reloading config file...\n";
3538 3620
3539 open my $fh, "<:utf8", "$CONFDIR/config" 3621 my $config = load_file "$CONFDIR/config";
3540 or return; 3622 utf8::decode $config;
3541 3623 *CFG = decode_yaml $config;
3542 local $/;
3543 *CFG = YAML::XS::Load scalar <$fh>;
3544 3624
3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3546 3626
3547 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3548 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3632 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3553 and die "WARNING: m(un)lockall failed: $!\n"; 3633 and die "WARNING: m(un)lockall failed: $!\n";
3554 }; 3634 };
3555 warn $@ if $@; 3635 warn $@ if $@;
3556 } 3636 }
3557
3558 trace "finished reloading resource files\n";
3559} 3637}
3560 3638
3561sub pidfile() { 3639sub pidfile() {
3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3640 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3563 or die "$PIDFILE: $!"; 3641 or die "$PIDFILE: $!";
… …
3588 3666
3589sub main { 3667sub main {
3590 cf::init_globals; # initialise logging 3668 cf::init_globals; # initialise logging
3591 3669
3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3593 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3671 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3596 3674
3597 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3598 3676
… …
3606 }; 3684 };
3607 3685
3608 evthread_start IO::AIO::poll_fileno; 3686 evthread_start IO::AIO::poll_fileno;
3609 3687
3610 cf::sync_job { 3688 cf::sync_job {
3611 cf::init_experience; 3689 cf::incloader::init ();
3690
3612 cf::init_anim; 3691 cf::init_anim;
3613 cf::init_attackmess; 3692 cf::init_attackmess;
3614 cf::init_dynamic; 3693 cf::init_dynamic;
3615 3694
3616 cf::load_settings; 3695 cf::load_settings;
3617 cf::load_materials;
3618 3696
3619 reload_resources; 3697 reload_resources;
3620 reload_config; 3698 reload_config;
3621 db_init; 3699 db_init;
3622 3700
… …
3634 3712
3635 # no (long-running) fork's whatsoever before this point(!) 3713 # no (long-running) fork's whatsoever before this point(!)
3636 use POSIX (); 3714 use POSIX ();
3637 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3638 3716
3639 (pop @POST_INIT)->(0) while @POST_INIT; 3717 cf::_post_init 0;
3640 }; 3718 };
3641 3719
3642 cf::object::thawer::errors_are_fatal 0; 3720 cf::object::thawer::errors_are_fatal 0;
3643 info "parse errors in files are no longer fatal from this point on.\n"; 3721 info "parse errors in files are no longer fatal from this point on.\n";
3644 3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3645 main_loop; 3727 goto &main_loop;
3646} 3728}
3647 3729
3648############################################################################# 3730#############################################################################
3649# initialisation and cleanup 3731# initialisation and cleanup
3650 3732
… …
3803 3885
3804 cf::write_runtime_sync; # external watchdog should not bark 3886 cf::write_runtime_sync; # external watchdog should not bark
3805 3887
3806 trace "emergency_perl_save: flushing outstanding aio requests"; 3888 trace "emergency_perl_save: flushing outstanding aio requests";
3807 while (IO::AIO::nreqs || BDB::nreqs) { 3889 while (IO::AIO::nreqs || BDB::nreqs) {
3808 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3809 } 3891 }
3810 3892
3811 cf::write_runtime_sync; # external watchdog should not bark 3893 cf::write_runtime_sync; # external watchdog should not bark
3812 }; 3894 };
3813 3895
… …
3851 } 3933 }
3852} 3934}
3853 3935
3854sub do_reload_perl() { 3936sub do_reload_perl() {
3855 # can/must only be called in main 3937 # can/must only be called in main
3856 if (in_main) { 3938 unless (in_main) {
3857 error "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3858 return; 3940 return;
3859 } 3941 }
3860 3942
3861 return if $RELOAD++; 3943 return if $RELOAD++;
3862 3944
3863 my $t1 = AE::time; 3945 my $t1 = AE::time;
3864 3946
3865 while ($RELOAD) { 3947 while ($RELOAD) {
3948 cf::get_slot 0.1, -1, "reload_perl";
3866 info "reloading..."; 3949 info "perl_reload: reloading...";
3867 3950
3868 trace "entering sync_job"; 3951 trace "perl_reload: entering sync_job";
3869 3952
3870 cf::sync_job { 3953 cf::sync_job {
3871 cf::emergency_save; 3954 #cf::emergency_save;
3872 3955
3873 trace "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3874 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3875 %EXT_CORO = (); 3958 %EXT_CORO = ();
3876 3959
3877 trace "removing commands"; 3960 trace "perl_reload: removing commands";
3878 %COMMAND = (); 3961 %COMMAND = ();
3879 3962
3880 trace "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3881 %EXTCMD = (); 3964 %EXTCMD = ();
3882 %EXTICMD = (); 3965 %EXTICMD = ();
3883 3966
3884 trace "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3885 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3886 trace "... unloading $pkg"; 3969 trace "... unloading $pkg";
3887 3970
3888 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3889 eval { 3972 eval {
… …
3894 3977
3895 trace "... clearing $pkg"; 3978 trace "... clearing $pkg";
3896 clear_package $pkg; 3979 clear_package $pkg;
3897 } 3980 }
3898 3981
3899 trace "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3900 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3902 3985
3903 trace "... unloading $k"; 3986 trace "... unloading $k";
3904 delete $INC{$k}; 3987 delete $INC{$k};
… …
3911 } 3994 }
3912 3995
3913 clear_package $k; 3996 clear_package $k;
3914 } 3997 }
3915 3998
3916 trace "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3917 clear_package "safe::$_" 4000 clear_package "safe::$_"
3918 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3919 4002
3920 trace "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3921 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3923 4006
3924 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3925 # and global variables created in xs 4008 # and global variables created in xs
3926 #clear_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3927 4010
3928 info "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3929 4012
3930 trace "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3931 require cf; 4014 require cf;
3932 cf::_connect_to_perl_1; 4015 cf::_connect_to_perl_1;
3933 4016
3934 trace "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3935 cf::reload_config; 4018 cf::reload_config;
3936 4019
3937 trace "loading extensions"; 4020 trace "perl_reload: loading extensions";
3938 cf::load_extensions; 4021 cf::load_extensions;
3939 4022
3940 if ($REATTACH_ON_RELOAD) { 4023 if ($REATTACH_ON_RELOAD) {
3941 trace "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3942 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3943 trace "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3944 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3945 trace "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3946 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
3947 } 4030 }
3948 4031
3949 trace "running post_init jobs"; 4032 cf::_post_init 1;
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951 4033
3952 trace "leaving sync_job"; 4034 trace "perl_reload: leaving sync_job";
3953 4035
3954 1 4036 1
3955 } or do { 4037 } or do {
3956 error $@; 4038 error $@;
3957 cf::cleanup "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3958 }; 4040 };
3959 4041
3960 info "reloaded";
3961 --$RELOAD; 4042 --$RELOAD;
3962 } 4043 }
3963 4044
3964 $t1 = AE::time - $t1; 4045 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n"; 4046 info "perl_reload: completed in ${t1}s\n";
3966}; 4047};
3967 4048
3968our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3969 4050
3970sub reload_perl() { 4051sub reload_perl() {
… …
3991 reload_perl; 4072 reload_perl;
3992 }; 4073 };
3993 } 4074 }
3994}; 4075};
3995 4076
3996unshift @INC, $LIBDIR; 4077#############################################################################
3997 4078
3998my $bug_warning = 0; 4079my $bug_warning = 0;
3999 4080
4000our @WAIT_FOR_TICK;
4001our @WAIT_FOR_TICK_BEGIN;
4002
4003sub wait_for_tick { 4081sub wait_for_tick() {
4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4005 4083
4006 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
4007 push @WAIT_FOR_TICK, $signal;
4008 $signal->wait;
4009} 4085}
4010 4086
4011sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4013 4089
4014 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
4015 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
4016 $signal->wait; 4092 $signal->wait;
4017} 4093}
… …
4021 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4022 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
4023 return; 4099 return;
4024 } 4100 }
4025 4101
4026 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
4027 4103
4028 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4029 4105
4030 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4037 } 4113 }
4038 4114
4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4040 $sig->send; 4116 $sig->send;
4041 } 4117 }
4042 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
4043 $sig->send;
4044 }
4045 4119
4046 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
4047 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4048 4122
4049 if (0) { 4123 if (0) {
… …
4058{ 4132{
4059 # configure BDB 4133 # configure BDB
4060 4134
4061 BDB::min_parallel 16; 4135 BDB::min_parallel 16;
4062 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
4063 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
4064 4138
4065 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
4066 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
4067 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4068 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4103 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
4104 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
4105 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
4106} 4180}
4107 4181
4108my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
4109 4184
4110sub _log_backtrace { 4185sub _log_backtrace {
4111 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
4112 4187
4113 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
4114 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4115 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
4116 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
4117 ++$_log_backtrace; 4196 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
4119 async { 4198 async {
4120 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
4121 4200
… …
4141 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
4142 --$_log_backtrace; 4221 --$_log_backtrace;
4143 }; 4222 };
4144 } else { 4223 } else {
4145 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
4146 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4147 } 4226 }
4148} 4227}
4149 4228
4150# load additional modules 4229# load additional modules
4151require "cf/$_.pm" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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