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.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV 1.86; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.32 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
18use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
23use Coro::BDB; 47use Coro::BDB 1.6;
24use Coro::Storable; 48use Coro::Storable;
25use Coro::Util (); 49use Coro::Util ();
26 50
27use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
28use BDB (); 52use BDB ();
29use Data::Dumper; 53use Data::Dumper;
30use Digest::MD5; 54use Digest::MD5;
31use Fcntl; 55use Fcntl;
32use YAML (); 56use YAML ();
33use IO::AIO 2.51 (); 57use IO::AIO ();
34use Time::HiRes; 58use Time::HiRes;
35use Compress::LZF; 59use Compress::LZF;
36use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
37 63
38# configure various modules to our taste 64# configure various modules to our taste
39# 65#
40$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
69our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 97our %RESOURCE;
72 98
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 101our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
79 103
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 107our $DB_ENV;
85 108
… …
96# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 121
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
102 126
103binmode STDOUT; 127binmode STDOUT;
104binmode STDERR; 128binmode STDERR;
105 129
106# read virtual server time, if available 130# read virtual server time, if available
… …
221for my $pkg (qw( 245for my $pkg (qw(
222 cf::global cf::attachable 246 cf::global cf::attachable
223 cf::object cf::object::player 247 cf::object cf::object::player
224 cf::client cf::player 248 cf::client cf::player
225 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
226 cf::map cf::party cf::region 251 cf::party cf::region
227)) { 252)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 254}
231 255
232$EV::DIED = sub { 256$EV::DIED = sub {
233 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
339 363
340 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
341} 365}
342 366
343sub freeze_mainloop { 367sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
345 369
346 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 371}
352 372
353=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
354 374
355Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
410 } 430 }
411 } 431 }
412}; 432};
413 433
414sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
415 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
416 438
417 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
419 441
… …
456 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
458 480
459 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
460 482
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
464 484
465 my $busy = 1; 485 my $busy = 1;
466 my @res; 486 my @res;
467 487
… …
478 } else { 498 } else {
479 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
480 } 500 }
481 } 501 }
482 502
483 $time = EV::time - $time; 503 my $time = EV::time - $time;
484 504
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
489 506
490 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
491 } else { 508 } else {
492 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
493 510
… …
535 reset_signals; 552 reset_signals;
536 &$cb 553 &$cb
537 }, @args; 554 }, @args;
538 555
539 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
540} 584}
541 585
542=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
543 587
544Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
1044 1088
1045sub reattach { 1089sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1091 my ($obj) = @_;
1048 1092
1093 # no longer needed after getting rid of delete_package?
1049 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1050 1095
1051 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1052 1097
1053 @$registry = (); 1098 @$registry = ();
1054 1099
… …
1100 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1103 1148
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1108 close $fh; 1153 aio_close $fh;
1109 1154
1110 if (@$objs) { 1155 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1116 close $fh; 1161 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1163 }
1119 } else { 1164 } else {
1120 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1121 } 1166 }
… …
1290 1335
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1338
1294 $ext{source} = 1339 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1297 . $source 1342 . $source
1298 . "\n};\n1"; 1343 . "\n};\n1";
1299 1344
1300 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1415 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1461 or return;
1417 1462
1418 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1419 or return; 1464 or return;
1465
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1423 } 1469 }
1424 } 1470 }
… …
1434 1480
1435 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1436 1482
1437 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1439 1487
1440 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1489 cf::cede_to_tick;
1442} 1490}
1443 1491
… …
1479 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1480 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1481 1529
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1483 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1485 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1486 1536
1487 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1527 1577
1528 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1529 my $path = path $login; 1579 my $path = path $login;
1530 1580
1531 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1587 }
1537 1588
… …
1736our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1738 1789
1739sub generate_random_map { 1790sub generate_random_map {
1740 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1741 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1796 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1867 1921
1868# the temporary/swap location 1922# the temporary/swap location
1869sub save_path { 1923sub save_path {
1870 my ($self) = @_; 1924 my ($self) = @_;
1871 1925
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1874} 1928}
1875 1929
1876# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1877sub uniq_path { 1931sub uniq_path {
1878 my ($self) = @_; 1932 my ($self) = @_;
1879 1933
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1882} 1936}
1883 1937
1884# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1885# all maps in C++... 1939# all maps in C++...
… …
1983 2037
1984 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1986 2040
1987 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
1990 2044
1991 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1992 or return; 2046 or return;
1993 2047
1994 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
1997 or return; 2051 or return;
1998 2052
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2002 undef $guard1; 2057 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2058 $map->reset;
2005 return find $path; 2059 return find $path;
2006 } 2060 }
2007 2061
2008 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2035 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block; 2090 $f->skip_block;
2037 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2038 or return; 2092 or return;
2039 2093
2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2041 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2042 2096
2043 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2044 utf8::encode $uniq; 2098 utf8::encode $uniq;
2045 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2071 } 2125 }
2072 2126
2073 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2075 2129
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2131 }
2078 2132
2079 $self->post_load; 2133 $self->post_load;
2080} 2134}
2081 2135
… …
2139 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2140 2194
2141 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2142 2196
2143 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2199 }
2146 2200
2147 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2148 2202
2149 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
… …
2186 cf::async { 2240 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2189 }; 2243 };
2190 2244
2245 cf::get_slot 0.02;
2246
2191 if ($uniq) { 2247 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2250 } else {
2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2251 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2203 $self->save; 2259 $self->save;
2204 2260
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2262
2207 return if $self->players; 2263 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2209 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2210 2266
2211 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2212 2268
2213 $self->deactivate; 2269 $self->deactivate;
… …
2331 2387
2332sub unique_maps() { 2388sub unique_maps() {
2333 [ 2389 [
2334 map { 2390 map {
2335 utf8::decode $_; 2391 utf8::decode $_;
2336 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2337 ? normalise $_ 2395 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2397 ]
2341} 2398}
2342 2399
2343package cf;
2344
2345=back 2400=back
2346 2401
2347=head3 cf::object 2402=head3 cf::object
2348 2403
2349=cut 2404=cut
… …
2352 2407
2353=over 4 2408=over 4
2354 2409
2355=item $ob->inv_recursive 2410=item $ob->inv_recursive
2356 2411
2357Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2358 2414
2359=cut 2415=cut
2360 2416
2361sub inv_recursive_; 2417sub inv_recursive_;
2362sub inv_recursive_ { 2418sub inv_recursive_ {
… …
2367 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2368} 2424}
2369 2425
2370=item $ref = $ob->ref 2426=item $ref = $ob->ref
2371 2427
2372creates and returns a persistent reference to an objetc that can be stored as a string. 2428Creates and returns a persistent reference to an object that can be stored as a string.
2373 2429
2374=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2375 2431
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block. 2433even if the object actually exists. May block.
… …
2409can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2410dialogue with the given NPC character. 2466dialogue with the given NPC character.
2411 2467
2412=cut 2468=cut
2413 2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2483
2414# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2485# with dialog boxes.
2416#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2417sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2429 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431 2501
2432 } else { 2502 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2505 }
2436 } 2506 }
2437} 2507}
2438 2508
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2546Moves the player to the given map-path and coordinates by first freezing 2616Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process. 2620be called at the end of this process.
2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2551 2624
2552=cut 2625=cut
2553 2626
2554our $GOTOGEN; 2627our $GOTOGEN;
2555 2628
… …
2634} 2707}
2635 2708
2636sub prepare_random_map { 2709sub prepare_random_map {
2637 my ($exit) = @_; 2710 my ($exit) = @_;
2638 2711
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2714 # that depends on the exit object
2644 2715
2645 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2647 if ($exit->map) { 2718 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2652 } 2725 }
2653 2726
2654 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2655 2728
2656 my $data = cf::encode_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2659 2732
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2735 undef $fh;
2663 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2664 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2667 } 2744 }
2668} 2745}
2669 2746
2670sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2672 2749
2673 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2674 2751
2675 if ($exit->slaying eq "/!") {
2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
2679 cf::sync_job { prepare_random_map $exit };
2680 }
2681
2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $hp = $exit->stats->hp;
2684 my $sp = $exit->stats->sp;
2685
2686 $self->enter_link; 2752 $self->enter_link;
2687 2753
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2692 (async { 2754 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2694 2756
2695 $self->deactivate_recursive; # just to be sure
2696 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2697 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2698 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2699 1; 2778 1
2700 }) { 2779 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2702 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2784 id => "infobox", 2863 id => "infobox",
2785 title => "Map Info", 2864 title => "Map Info",
2786 reply => undef, 2865 reply => undef,
2787 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2788 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2789); 2874);
2790 2875
2791sub cf::client::send_msg { 2876sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2793 2878
… …
3030 3115
3031The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3032 3117
3033 cf::object 3118 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3119 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3036 3121
3037 cf::object::player 3122 cf::object::player
3038 player 3123 player
3039 3124
3040 cf::player 3125 cf::player
… …
3045 3130
3046=cut 3131=cut
3047 3132
3048for ( 3133for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3052 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3054 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3055) { 3140) {
3056 no strict 'refs'; 3141 no strict 'refs';
… …
3264 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3266 } 3351 }
3267}; 3352};
3268 3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3363
3269sub reload_regions { 3364sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3366 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3368
… …
3286} 3381}
3287 3382
3288sub reload_archetypes { 3383sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3386}
3297 3387
3298sub reload_treasures { 3388sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3301} 3391}
3302 3392
3303sub reload_resources { 3393sub reload_resources {
3304 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3305 3395
3396 reload_facedata;
3397 reload_archetypes;
3306 reload_regions; 3398 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3399 reload_treasures;
3311 3400
3312 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3313} 3402}
3314 3403
3315sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3316 reload_resources; 3409 reload_resources;
3317} 3410}
3318 3411
3319sub reload_config { 3412sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3348 }; 3441 };
3349 3442
3443 {
3444 my $guard = freeze_mainloop;
3350 reload_config; 3445 reload_config;
3351 db_init; 3446 db_init;
3352 load_extensions; 3447 load_extensions;
3353 3448
3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
3356 EV::loop; 3452 EV::loop;
3357} 3453}
3358 3454
3359############################################################################# 3455#############################################################################
3360# initialisation and cleanup 3456# initialisation and cleanup
… …
3367 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3368 }; 3464 };
3369 } 3465 }
3370} 3466}
3371 3467
3372sub write_runtime { 3468sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3374 3470
3375 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3377 3473
… …
3403 and return; 3499 and return;
3404 3500
3405 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3406 3502
3407 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3408} 3547}
3409 3548
3410sub emergency_save() { 3549sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3412 3551
… …
3434 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3435 3574
3436 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3439 }; 3582 };
3440 3583
3441 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3442} 3585}
3443 3586
… …
3445 my ($make_core) = @_; 3588 my ($make_core) = @_;
3446 3589
3447 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3448 if $make_core; 3591 if $make_core;
3449} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3450 3621
3451sub do_reload_perl() { 3622sub do_reload_perl() {
3452 # can/must only be called in main 3623 # can/must only be called in main
3453 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3454 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3455 return; 3626 return;
3456 } 3627 }
3457 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3458 warn "reloading..."; 3632 warn "reloading...";
3459 3633
3460 warn "entering sync_job"; 3634 warn "entering sync_job";
3461 3635
3462 cf::sync_job { 3636 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3638 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3466 3640
3467 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3643
3470 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3471 3645
3472 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3473 for (;;) {
3474 BDB::flush;
3475 IO::AIO::flush;
3476 Coro::cede_notself;
3477 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3478 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3479 }
3480
3481 ++$RELOAD;
3482
3483 warn "cancelling all extension coros";
3484 $_->cancel for values %EXT_CORO;
3485 %EXT_CORO = ();
3486
3487 warn "removing commands";
3488 %COMMAND = ();
3489
3490 warn "removing ext/exti commands";
3491 %EXTCMD = ();
3492 %EXTICMD = ();
3493
3494 warn "unloading/nuking all extensions";
3495 for my $pkg (@EXTS) {
3496 warn "... unloading $pkg";
3497
3498 if (my $cb = $pkg->can ("unload")) {
3499 eval {
3500 $cb->($pkg);
3501 1
3502 } or warn "$pkg unloaded, but with errors: $@";
3503 } 3649 }
3504 3650
3505 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3506 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3507 } 3653 %EXT_CORO = ();
3508 3654
3509 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3510 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3511 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3512 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3513 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3514 delete $INC{$k};
3515 3665
3516 $k =~ s/\.pm$//;
3517 $k =~ s/\//::/g;
3518
3519 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3520 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3521 } 3675 }
3522 3676
3523 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3524 } 3692 }
3525 3693
3526 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3527 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3529 3697
3530 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3531 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3533 3701
3534 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3535 # and global variables created in xs 3703 # and global variables created in xs
3536 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3537 3705
3538 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3539 3707
3540 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3541 require cf; 3709 require cf;
3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3543 3711
3544 warn "loading config and database again"; 3712 warn "loading config and database again";
3545 cf::reload_config; 3713 cf::reload_config;
3546 3714
3547 warn "loading extensions"; 3715 warn "loading extensions";
3548 cf::load_extensions; 3716 cf::load_extensions;
3549 3717
3550 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3551 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3552 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3553 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3554 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3555 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3556 3724
3557 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3558 3726
3559 1 3727 1
3560 } or do { 3728 } or do {
3561 warn $@; 3729 warn $@;
3562 cf::cleanup "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3563 }; 3731 };
3564 3732
3565 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3566}; 3736};
3567 3737
3568our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3569 3739
3570sub reload_perl() { 3740sub reload_perl() {
… …
3595 3765
3596our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3598 3768
3599sub wait_for_tick { 3769sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3602 3771
3603 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3774 $signal->wait;
3606} 3775}
3607 3776
3608sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3611 3779
3612 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3782 $signal->wait;
3615} 3783}
3616 3784
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3785sub tick {
3618 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3621 return; 3789 return;
3622 } 3790 }
3623 3791
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 3793
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 3796 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 3797 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 3798 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3637 }; 3800 };
3638 } 3801 }
3639 3802
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3642 } 3805 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 3807 $sig->send;
3645 } 3808 }
3646 3809
3647 $LOAD = ($NOW - $tick_start) / $TICK; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 3812
3650 _post_tick; 3813 if (0) {
3651}; 3814 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3819 }
3820}
3653 3821
3654{ 3822{
3655 # configure BDB 3823 # configure BDB
3656 3824
3657 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3658 BDB::max_poll_reqs $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 3827 $AnyEvent::BDB::WATCHER->priority (1);
3660 3828
3661 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3664 | BDB::LOG_AUTOREMOVE, 1); 3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3667 3836
3668 cf::sync_job { 3837 cf::sync_job {
3669 eval { 3838 eval {
… …
3695{ 3864{
3696 # configure IO::AIO 3865 # configure IO::AIO
3697 3866
3698 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 3869 undef $AnyEvent::AIO::WATCHER;
3701} 3870}
3702 3871
3703my $_log_backtrace; 3872my $_log_backtrace;
3704 3873
3705sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

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