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.534 by root, Thu Apr 29 08:13:51 2010 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
135our $NOW; 138our $NOW;
136 139
137our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
148 151
149our @POST_INIT; 152our @POST_INIT;
150 153
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
153 159
154binmode STDOUT; 160binmode STDOUT;
155binmode STDERR; 161binmode STDERR;
156 162
157# read virtual server time, if available 163# read virtual server time, if available
… …
191 197
192=over 4 198=over 4
193 199
194=item $cf::UPTIME 200=item $cf::UPTIME
195 201
196The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
197 218
198=item $cf::RUNTIME 219=item $cf::RUNTIME
199 220
200The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 222every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
210database environment. 231database environment.
211 232
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 233=item $cf::LOADAVG
221 234
222The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
233from wherever your confdir points to. 246from wherever your confdir points to.
234 247
235=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
236 249
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
240 270
241=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
242 272
243This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
307} 337}
308 338
309$EV::DIED = sub { 339$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
311}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
312 347
313############################################################################# 348#############################################################################
314 349
315=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
316 351
… …
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 373 $d
339 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
340} 375}
341 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
342=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
343 392
344Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
345 394
346=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 402
354sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
356 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
357=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
358 438
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
361 441
362The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 443is a reload or not.
364 444
365=cut 445=cut
366 446
367sub post_init(&) { 447sub post_init(&) {
368 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
369} 466}
370 467
371=item cf::lock_wait $string 468=item cf::lock_wait $string
372 469
373Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
427} 524}
428 525
429=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
430 527
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
434 535
435The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
437 538
438Useful for short background jobs. 539Useful for short background jobs.
… …
467 } 568 }
468 } 569 }
469 570
470 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
473 $signal->wait;
474 } else { 574 } else {
475 $busy = 0; 575 $busy = 0;
476 Coro::schedule; 576 Coro::schedule;
477 } 577 }
478 } 578 }
… …
578 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
579 679
580 $coro 680 $coro
581} 681}
582 682
583=item fork_call { }, $args 683=item fork_call { }, @args
584 684
585Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 688never block itself or use any form of event handling.
589 689
590=cut 690=cut
591 691
692sub post_fork {
693 reset_signals;
694}
695
592sub fork_call(&@) { 696sub fork_call(&@) {
593 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
594 698
595 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
598 702
599 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
600 reset_signals; 704 cf::post_fork;
601 &$cb 705 &$cb
602 }, @args; 706 } @args;
603 707
604 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
605} 709}
606 710
607sub objinfo { 711sub objinfo {
… …
729 833
730 my @data; 834 my @data;
731 my $md5; 835 my $md5;
732 836
733 for (0 .. $#$src) { 837 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 839 }
737 840
738 # if processing is expensive, check 841 # if processing is expensive, check
739 # checksum first 842 # checksum first
740 if (1) { 843 if (1) {
… …
1423 1526
1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1426 1529
1427 $ext{source} = 1530 $ext{source} =
1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1429 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1430 . $source 1533 . $source
1431 . "\n};\n1"; 1534 . "\n};\n1";
1432 1535
1433 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
… …
1474 1577
1475 while (my ($k, $v) = each %todo) { 1578 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1580 if exists $v->{meta}{mandatory};
1478 } 1581 }
1582
1583 last;
1479 } 1584 }
1480 } 1585 }
1481 }; 1586 };
1482} 1587}
1483 1588
… …
1641 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1642 1747
1643 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1645 1750
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1752 $pl->deactivate;
1753
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1650 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1651 1759
1652 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1928sub generate_random_map {
1821 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1822 1930
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824 1932
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1934}
1840 1935
1841=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1842 1937
1843Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
… …
1848 1943
1849sub register { 1944sub register {
1850 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1851 my $pkg = caller; 1946 my $pkg = caller;
1852 1947
1853 no strict;
1854 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1855 1949
1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1857} 1951}
1858 1952
… …
1870} 1964}
1871 1965
1872sub normalise { 1966sub normalise {
1873 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1874 1968
1875 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1876 1970
1877 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1878 1972
1879 # map plan: 1973 # map plan:
1880 # 1974 #
… …
1895 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1896 $path = "$base/$path"; 1990 $path = "$base/$path";
1897 } 1991 }
1898 1992
1899 for ($path) { 1993 for ($path) {
1900 redo if s{//}{/};
1901 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1902 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1903 } 1996 }
1904 1997
1905 $path 1998 $path
… …
1919 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1920 return $self; 2013 return $self;
1921 } 2014 }
1922 } 2015 }
1923 2016
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 2018 ()
1926} 2019}
1927 2020
2021# may re-bless or do other evil things
1928sub init { 2022sub init {
1929 my ($self) = @_; 2023 my ($self) = @_;
1930 2024
1931 $self 2025 $self
1932} 2026}
… …
1997 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1998 2092
1999 1 2093 1
2000} 2094}
2001 2095
2096# used to laod the header of an original map
2002sub load_header_orig { 2097sub load_header_orig {
2003 my ($self) = @_; 2098 my ($self) = @_;
2004 2099
2005 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
2006} 2101}
2007 2102
2103# used to laod the header of an instantiated map
2008sub load_header_temp { 2104sub load_header_temp {
2009 my ($self) = @_; 2105 my ($self) = @_;
2010 2106
2011 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
2012} 2108}
2013 2109
2110# called after loading the header from an instantiated map
2014sub prepare_temp { 2111sub prepare_temp {
2015 my ($self) = @_; 2112 my ($self) = @_;
2016 2113
2017 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
2018 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
2019 # safety 2116 # safety
2020 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
2021 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
2022} 2119}
2023 2120
2121# called after loading the header from an original map
2024sub prepare_orig { 2122sub prepare_orig {
2025 my ($self) = @_; 2123 my ($self) = @_;
2026 2124
2027 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2028 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2052 2150
2053sub find; 2151sub find;
2054sub find { 2152sub find {
2055 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2056 2154
2155 cf::cede_to_tick;
2156
2057 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2058 2158
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2061 2161
2062 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2093 2193
2094 { 2194 {
2095 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2096 2196
2097 return unless $self->valid; 2197 return unless $self->valid;
2098 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2099
2100 $self->in_memory (cf::MAP_LOADING);
2101 2199
2102 $self->alloc; 2200 $self->alloc;
2103 2201
2104 $self->pre_load; 2202 $self->pre_load;
2105 cf::cede_to_tick; 2203 cf::cede_to_tick;
2106 2204
2205 if (exists $self->{load_path}) {
2107 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2108 $f->skip_block; 2207 $f->skip_block;
2109 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2110 or return; 2209 or return;
2111 2210
2112 $self->post_load_original 2211 $self->post_load_original
2113 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2114 2213
2115 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2116 utf8::encode $uniq; 2215 utf8::encode $uniq;
2117 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2118 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2119 $self->clear_unique_items; 2218 $self->clear_unique_items;
2120 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2121 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2122 } 2222 }
2123 } 2223 }
2124 }
2125 2224
2126 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2127 2232
2128 cf::cede_to_tick; 2233 cf::cede_to_tick;
2129 # now do the right thing for maps 2234 # now do the right thing for maps
2130 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2131 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2135 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2136 $self->decay_objects; 2241 $self->decay_objects;
2137 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2138 $self->update_buttons; 2243 $self->update_buttons;
2139 cf::cede_to_tick; 2244 cf::cede_to_tick;
2140 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2141 } 2246 }
2142 2247
2143 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2144 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2145
2146 $self->in_memory (cf::MAP_ACTIVE);
2147 } 2250 }
2148 2251
2149 $self->post_load; 2252 $self->post_load;
2253
2254 1
2150} 2255}
2151 2256
2152# customize the map for a given player, i.e. 2257# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player 2258# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath 2259# maps to change the path to ~playername/mappath
… …
2162# if $self->per_party; 2267# if $self->per_party;
2163 2268
2164 $self 2269 $self
2165} 2270}
2166 2271
2167# find and load all maps in the 3x3 area around a map
2168sub load_neighbours {
2169 my ($map) = @_;
2170
2171 my @neigh; # diagonal neighbours
2172
2173 for (0 .. 3) {
2174 my $neigh = $map->tile_path ($_)
2175 or next;
2176 $neigh = find $neigh, $map
2177 or next;
2178 $neigh->load;
2179
2180 # now find the diagonal neighbours
2181 push @neigh,
2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2184 }
2185
2186 for (grep defined $_->[0], @neigh) {
2187 my ($path, $origin) = @$_;
2188 my $neigh = find $path, $origin
2189 or next;
2190 $neigh->load;
2191 }
2192}
2193
2194sub find_sync { 2272sub find_sync {
2195 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2196 2274
2275 # it's a bug to call this from the main context
2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main; 2277 if $Coro::current == $Coro::main;
2199 2278
2200 find $path, $origin 2279 find $path, $origin
2201} 2280}
2202 2281
2203sub do_load_sync { 2282sub do_load_sync {
2204 my ($map) = @_; 2283 my ($map) = @_;
2205 2284
2285 # it's a bug to call this from the main context
2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2208 2288
2209 $map->load; 2289 $map->load;
2210} 2290}
… …
2213our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2214 2294
2215sub find_async { 2295sub find_async {
2216 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2217 2297
2218 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2219 2299
2220 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2222 } 2302 }
2223 2303
2224 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2225 2305
2226 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
… …
2285sub swap_out { 2365sub swap_out {
2286 my ($self) = @_; 2366 my ($self) = @_;
2287 2367
2288 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2289 2369
2290 return if $self->in_memory != cf::MAP_ACTIVE; 2370 return if !$self->linkable;
2291 return if $self->{deny_save}; 2371 return if $self->{deny_save};
2292 return if $self->players; 2372 return if $self->players;
2293 2373
2294 # first deactivate the map and "unlink" it from the core 2374 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate; 2375 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2297 $self->in_memory (cf::MAP_SWAPPED); 2377 $self->state (cf::MAP_SWAPPED);
2298 2378
2299 # then atomically save 2379 # then atomically save
2300 $self->_save; 2380 $self->_save;
2301 2381
2302 # then free the map 2382 # then free the map
… …
2328 2408
2329 return if $self->players; 2409 return if $self->players;
2330 2410
2331 cf::trace "resetting map ", $self->path, "\n"; 2411 cf::trace "resetting map ", $self->path, "\n";
2332 2412
2333 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2334 2414
2335 # need to save uniques path 2415 # need to save uniques path
2336 unless ($self->{deny_save}) { 2416 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq; 2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338 2418
… …
2668 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2669 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2670 if $x <= 0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2671 2751
2672 $map->load; 2752 $map->load;
2673 $map->load_neighbours;
2674 2753
2675 return unless $self->contr->active; 2754 return unless $self->contr->active;
2676 2755
2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678 if ($self->enter_map ($map, $x, $y)) { 2757 if ($self->enter_map ($map, $x, $y)) {
… …
2734 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2735 } 2814 }
2736 } 2815 }
2737 2816
2738 my $map = eval { 2817 my $map = eval {
2739 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740 2819
2741 if ($map) { 2820 if ($map) {
2742 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2743 $map = $check->($map, $x, $y, $self) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2744 } else { 2823 } else {
… …
2834 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2835 2914
2836 unless (eval { 2915 unless (eval {
2837 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2838 2917
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2848 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp; 2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2850 2944
2851 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2852 2946
2853 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
… …
3273 decrease split destroy change_exp value msg lore send_msg)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3274 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3275 ["cf::player" => qw(peaceful send_msg)], 3369 ["cf::player" => qw(peaceful send_msg)],
3276 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3277) { 3371) {
3278 no strict 'refs';
3279 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3281 for @funs; 3374 for @funs;
3282} 3375}
3283 3376
… …
3370 3463
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3465
3373 trace "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3374 3467
3375 my $facedata; 3468 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 3469
3381 $facedata->{version} == 2 3470 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3472
3384 # patch in the exptable 3473 # patch in the exptable
… …
3398 3487
3399 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3403 3493
3404 cf::cede_to_tick; 3494 cf::cede_to_tick;
3405 } 3495 }
3406 3496
3407 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
… …
3502} 3592}
3503 3593
3504sub reload_sound { 3594sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n"; 3595 trace "loading sound config from $DATADIR/sound\n";
3506 3596
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511 3598
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_] 3600 my $sound = $soundconf->{compat}[$_]
3514 or next; 3601 or next;
3515 3602
… …
3525} 3612}
3526 3613
3527sub reload_resources { 3614sub reload_resources {
3528 trace "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3529 3616
3617 reload_exp_table;
3618 reload_materials;
3530 reload_facedata; 3619 reload_facedata;
3531 reload_sound; 3620 reload_sound;
3532 reload_archetypes; 3621 reload_archetypes;
3533 reload_regions; 3622 reload_regions;
3534 reload_treasures; 3623 reload_treasures;
… …
3537} 3626}
3538 3627
3539sub reload_config { 3628sub reload_config {
3540 trace "reloading config file...\n"; 3629 trace "reloading config file...\n";
3541 3630
3542 open my $fh, "<:utf8", "$CONFDIR/config" 3631 my $config = load_file "$CONFDIR/config";
3543 or return; 3632 utf8::decode $config;
3544 3633 *CFG = decode_yaml $config;
3545 local $/;
3546 *CFG = YAML::XS::Load scalar <$fh>;
3547 3634
3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549 3636
3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3642 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556 and die "WARNING: m(un)lockall failed: $!\n"; 3643 and die "WARNING: m(un)lockall failed: $!\n";
3557 }; 3644 };
3558 warn $@ if $@; 3645 warn $@ if $@;
3559 } 3646 }
3560
3561 trace "finished reloading resource files\n";
3562} 3647}
3563 3648
3564sub pidfile() { 3649sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3650 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!"; 3651 or die "$PIDFILE: $!";
… …
3591 3676
3592sub main { 3677sub main {
3593 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3594 3679
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599 3684
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601 3686
… …
3609 }; 3694 };
3610 3695
3611 evthread_start IO::AIO::poll_fileno; 3696 evthread_start IO::AIO::poll_fileno;
3612 3697
3613 cf::sync_job { 3698 cf::sync_job {
3614 cf::init_experience; 3699 cf::incloader::init ();
3700
3615 cf::init_anim; 3701 cf::init_anim;
3616 cf::init_attackmess; 3702 cf::init_attackmess;
3617 cf::init_dynamic; 3703 cf::init_dynamic;
3618 3704
3619 cf::load_settings; 3705 cf::load_settings;
3620 cf::load_materials;
3621 3706
3622 reload_resources; 3707 reload_resources;
3623 reload_config; 3708 reload_config;
3624 db_init; 3709 db_init;
3625 3710
… …
3637 3722
3638 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX (); 3724 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641 3726
3642 (pop @POST_INIT)->(0) while @POST_INIT; 3727 cf::_post_init 0;
3643 }; 3728 };
3644 3729
3645 cf::object::thawer::errors_are_fatal 0; 3730 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n"; 3731 info "parse errors in files are no longer fatal from this point on.\n";
3647 3732
3733 my $free_main; $free_main = EV::idle sub {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :)
3736 };
3737
3648 main_loop; 3738 goto &main_loop;
3649} 3739}
3650 3740
3651############################################################################# 3741#############################################################################
3652# initialisation and cleanup 3742# initialisation and cleanup
3653 3743
… …
3758 # save all maps without fsync, and later call a global sync 3848 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow) 3849 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0; 3850 local $USE_FSYNC = 0;
3761 3851
3762 cf::sync_job { 3852 cf::sync_job {
3853 cf::write_runtime_sync; # external watchdog should not bark
3854
3763 # use a peculiar iteration method to avoid tripping on perl 3855 # use a peculiar iteration method to avoid tripping on perl
3764 # refcount bugs in for. also avoids problems with players 3856 # refcount bugs in for. also avoids problems with players
3765 # and maps saved/destroyed asynchronously. 3857 # and maps saved/destroyed asynchronously.
3766 info "emergency_perl_save: begin player save\n"; 3858 info "emergency_perl_save: begin player save\n";
3767 for my $login (keys %cf::PLAYER) { 3859 for my $login (keys %cf::PLAYER) {
… …
3770 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3862 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3771 $pl->save; 3863 $pl->save;
3772 } 3864 }
3773 info "emergency_perl_save: end player save\n"; 3865 info "emergency_perl_save: end player save\n";
3774 3866
3867 cf::write_runtime_sync; # external watchdog should not bark
3868
3775 info "emergency_perl_save: begin map save\n"; 3869 info "emergency_perl_save: begin map save\n";
3776 for my $path (keys %cf::MAP) { 3870 for my $path (keys %cf::MAP) {
3777 my $map = $cf::MAP{$path} or next; 3871 my $map = $cf::MAP{$path} or next;
3778 $map->valid or next; 3872 $map->valid or next;
3779 $map->save; 3873 $map->save;
3780 } 3874 }
3781 info "emergency_perl_save: end map save\n"; 3875 info "emergency_perl_save: end map save\n";
3782 3876
3877 cf::write_runtime_sync; # external watchdog should not bark
3878
3783 info "emergency_perl_save: begin database checkpoint\n"; 3879 info "emergency_perl_save: begin database checkpoint\n";
3784 BDB::db_env_txn_checkpoint $DB_ENV; 3880 BDB::db_env_txn_checkpoint $DB_ENV;
3785 info "emergency_perl_save: end database checkpoint\n"; 3881 info "emergency_perl_save: end database checkpoint\n";
3786 3882
3787 info "emergency_perl_save: begin write uuid\n"; 3883 info "emergency_perl_save: begin write uuid\n";
3788 write_uuid_sync 1; 3884 write_uuid_sync 1;
3789 info "emergency_perl_save: end write uuid\n"; 3885 info "emergency_perl_save: end write uuid\n";
3790 };
3791 3886
3887 cf::write_runtime_sync; # external watchdog should not bark
3888
3889 trace "emergency_perl_save: syncing database to disk";
3890 BDB::db_env_txn_checkpoint $DB_ENV;
3891
3792 info "emergency_perl_save: starting sync()\n"; 3892 info "emergency_perl_save: starting sync\n";
3793 IO::AIO::aio_sync sub { 3893 IO::AIO::aio_sync sub {
3794 info "emergency_perl_save: finished sync()\n"; 3894 info "emergency_perl_save: finished sync\n";
3895 };
3896
3897 cf::write_runtime_sync; # external watchdog should not bark
3898
3899 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3902 }
3903
3904 cf::write_runtime_sync; # external watchdog should not bark
3795 }; 3905 };
3796 3906
3797 info "emergency_perl_save: leave\n"; 3907 info "emergency_perl_save: leave\n";
3798} 3908}
3799 3909
3800sub post_cleanup { 3910sub post_cleanup {
3801 my ($make_core) = @_; 3911 my ($make_core) = @_;
3912
3913 IO::AIO::flush;
3802 3914
3803 error Carp::longmess "post_cleanup backtrace" 3915 error Carp::longmess "post_cleanup backtrace"
3804 if $make_core; 3916 if $make_core;
3805 3917
3806 my $fh = pidfile; 3918 my $fh = pidfile;
… …
3832 } 3944 }
3833} 3945}
3834 3946
3835sub do_reload_perl() { 3947sub do_reload_perl() {
3836 # can/must only be called in main 3948 # can/must only be called in main
3837 if (in_main) { 3949 unless (in_main) {
3838 error "can only reload from main coroutine"; 3950 error "can only reload from main coroutine";
3839 return; 3951 return;
3840 } 3952 }
3841 3953
3842 return if $RELOAD++; 3954 return if $RELOAD++;
3843 3955
3844 my $t1 = AE::time; 3956 my $t1 = AE::time;
3845 3957
3846 while ($RELOAD) { 3958 while ($RELOAD) {
3959 cf::get_slot 0.1, -1, "reload_perl";
3847 info "reloading..."; 3960 info "perl_reload: reloading...";
3848 3961
3849 trace "entering sync_job"; 3962 trace "perl_reload: entering sync_job";
3850 3963
3851 cf::sync_job { 3964 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853 cf::emergency_save; 3965 #cf::emergency_save;
3854 cf::write_runtime_sync; # external watchdog should not bark
3855 3966
3856 trace "syncing database to disk";
3857 BDB::db_env_txn_checkpoint $DB_ENV;
3858
3859 # if anything goes wrong in here, we should simply crash as we already saved
3860
3861 trace "flushing outstanding aio requests";
3862 while (IO::AIO::nreqs || BDB::nreqs) {
3863 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3864 }
3865
3866 trace "cancelling all extension coros"; 3967 trace "perl_reload: cancelling all extension coros";
3867 $_->cancel for values %EXT_CORO; 3968 $_->cancel for values %EXT_CORO;
3868 %EXT_CORO = (); 3969 %EXT_CORO = ();
3869 3970
3870 trace "removing commands"; 3971 trace "perl_reload: removing commands";
3871 %COMMAND = (); 3972 %COMMAND = ();
3872 3973
3873 trace "removing ext/exti commands"; 3974 trace "perl_reload: removing ext/exti commands";
3874 %EXTCMD = (); 3975 %EXTCMD = ();
3875 %EXTICMD = (); 3976 %EXTICMD = ();
3876 3977
3877 trace "unloading/nuking all extensions"; 3978 trace "perl_reload: unloading/nuking all extensions";
3878 for my $pkg (@EXTS) { 3979 for my $pkg (@EXTS) {
3879 trace "... unloading $pkg"; 3980 trace "... unloading $pkg";
3880 3981
3881 if (my $cb = $pkg->can ("unload")) { 3982 if (my $cb = $pkg->can ("unload")) {
3882 eval { 3983 eval {
… …
3887 3988
3888 trace "... clearing $pkg"; 3989 trace "... clearing $pkg";
3889 clear_package $pkg; 3990 clear_package $pkg;
3890 } 3991 }
3891 3992
3892 trace "unloading all perl modules loaded from $LIBDIR"; 3993 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3893 while (my ($k, $v) = each %INC) { 3994 while (my ($k, $v) = each %INC) {
3894 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3995 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3895 3996
3896 trace "... unloading $k"; 3997 trace "... unloading $k";
3897 delete $INC{$k}; 3998 delete $INC{$k};
… …
3904 } 4005 }
3905 4006
3906 clear_package $k; 4007 clear_package $k;
3907 } 4008 }
3908 4009
3909 trace "getting rid of safe::, as good as possible"; 4010 trace "perl_reload: getting rid of safe::, as good as possible";
3910 clear_package "safe::$_" 4011 clear_package "safe::$_"
3911 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4012 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3912 4013
3913 trace "unloading cf.pm \"a bit\""; 4014 trace "perl_reload: unloading cf.pm \"a bit\"";
3914 delete $INC{"cf.pm"}; 4015 delete $INC{"cf.pm"};
3915 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4016 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3916 4017
3917 # don't, removes xs symbols, too, 4018 # don't, removes xs symbols, too,
3918 # and global variables created in xs 4019 # and global variables created in xs
3919 #clear_package __PACKAGE__; 4020 #clear_package __PACKAGE__;
3920 4021
3921 info "unload completed, starting to reload now"; 4022 info "perl_reload: unload completed, starting to reload now";
3922 4023
3923 trace "reloading cf.pm"; 4024 trace "perl_reload: reloading cf.pm";
3924 require cf; 4025 require cf;
3925 cf::_connect_to_perl_1; 4026 cf::_connect_to_perl_1;
3926 4027
3927 trace "loading config and database again"; 4028 trace "perl_reload: loading config and database again";
3928 cf::reload_config; 4029 cf::reload_config;
3929 4030
3930 trace "loading extensions"; 4031 trace "perl_reload: loading extensions";
3931 cf::load_extensions; 4032 cf::load_extensions;
3932 4033
3933 if ($REATTACH_ON_RELOAD) { 4034 if ($REATTACH_ON_RELOAD) {
3934 trace "reattaching attachments to objects/players"; 4035 trace "perl_reload: reattaching attachments to objects/players";
3935 _global_reattach; # objects, sockets 4036 _global_reattach; # objects, sockets
3936 trace "reattaching attachments to maps"; 4037 trace "perl_reload: reattaching attachments to maps";
3937 reattach $_ for values %MAP; 4038 reattach $_ for values %MAP;
3938 trace "reattaching attachments to players"; 4039 trace "perl_reload: reattaching attachments to players";
3939 reattach $_ for values %PLAYER; 4040 reattach $_ for values %PLAYER;
3940 } 4041 }
3941 4042
3942 trace "running post_init jobs"; 4043 cf::_post_init 1;
3943 (pop @POST_INIT)->(1) while @POST_INIT;
3944 4044
3945 trace "leaving sync_job"; 4045 trace "perl_reload: leaving sync_job";
3946 4046
3947 1 4047 1
3948 } or do { 4048 } or do {
3949 error $@; 4049 error $@;
3950 cf::cleanup "error while reloading, exiting."; 4050 cf::cleanup "perl_reload: error, exiting.";
3951 }; 4051 };
3952 4052
3953 info "reloaded";
3954 --$RELOAD; 4053 --$RELOAD;
3955 } 4054 }
3956 4055
3957 $t1 = AE::time - $t1; 4056 $t1 = AE::time - $t1;
3958 info "reload completed in ${t1}s\n"; 4057 info "perl_reload: completed in ${t1}s\n";
3959}; 4058};
3960 4059
3961our $RELOAD_WATCHER; # used only during reload 4060our $RELOAD_WATCHER; # used only during reload
3962 4061
3963sub reload_perl() { 4062sub reload_perl() {
… …
3984 reload_perl; 4083 reload_perl;
3985 }; 4084 };
3986 } 4085 }
3987}; 4086};
3988 4087
3989unshift @INC, $LIBDIR; 4088#############################################################################
3990 4089
3991my $bug_warning = 0; 4090my $bug_warning = 0;
3992 4091
3993our @WAIT_FOR_TICK;
3994our @WAIT_FOR_TICK_BEGIN;
3995
3996sub wait_for_tick { 4092sub wait_for_tick() {
3997 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3998 4094
3999 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
4000 push @WAIT_FOR_TICK, $signal;
4001 $signal->wait;
4002} 4096}
4003 4097
4004sub wait_for_tick_begin { 4098sub wait_for_tick_begin() {
4005 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4006 4100
4007 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
4008 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
4009 $signal->wait; 4103 $signal->wait;
4010} 4104}
… …
4014 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4108 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4015 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
4016 return; 4110 return;
4017 } 4111 }
4018 4112
4019 cf::server_tick; # one server iteration 4113 cf::one_tick; # one server iteration
4020 4114
4021 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4115 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4022 4116
4023 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4024 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4118 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4030 } 4124 }
4031 4125
4032 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4033 $sig->send; 4127 $sig->send;
4034 } 4128 }
4035 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
4036 $sig->send;
4037 }
4038 4130
4039 $LOAD = ($NOW - $TICK_START) / $TICK; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
4040 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4041 4133
4042 if (0) { 4134 if (0) {
… …
4096 IO::AIO::min_parallel 8; 4188 IO::AIO::min_parallel 8;
4097 IO::AIO::max_poll_time $TICK * 0.1; 4189 IO::AIO::max_poll_time $TICK * 0.1;
4098 undef $AnyEvent::AIO::WATCHER; 4190 undef $AnyEvent::AIO::WATCHER;
4099} 4191}
4100 4192
4101my $_log_backtrace; 4193our $_log_backtrace;
4194our $_log_backtrace_last;
4102 4195
4103sub _log_backtrace { 4196sub _log_backtrace {
4104 my ($msg, @addr) = @_; 4197 my ($msg, @addr) = @_;
4105 4198
4106 $msg =~ s/\n//; 4199 $msg =~ s/\n$//;
4107 4200
4201 if ($_log_backtrace_last eq $msg) {
4202 LOG llevInfo, "[ABT] $msg\n";
4203 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4108 # limit the # of concurrent backtraces 4204 # limit the # of concurrent backtraces
4109 if ($_log_backtrace < 2) { 4205 } elsif ($_log_backtrace < 2) {
4206 $_log_backtrace_last = $msg;
4110 ++$_log_backtrace; 4207 ++$_log_backtrace;
4111 my $perl_bt = Carp::longmess $msg; 4208 my $perl_bt = Carp::longmess $msg;
4112 async { 4209 async {
4113 $Coro::current->{desc} = "abt $msg"; 4210 $Coro::current->{desc} = "abt $msg";
4114 4211
… …
4134 LOG llevInfo, "[ABT] $_\n" for @bt; 4231 LOG llevInfo, "[ABT] $_\n" for @bt;
4135 --$_log_backtrace; 4232 --$_log_backtrace;
4136 }; 4233 };
4137 } else { 4234 } else {
4138 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $msg\n";
4139 LOG llevInfo, "[ABT] [suppressed]\n"; 4236 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4140 } 4237 }
4141} 4238}
4142 4239
4143# load additional modules 4240# load additional modules
4144require "cf/$_.pm" for @EXTRA_MODULES; 4241require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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