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.410 by root, Tue Jan 15 12:02:24 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;
… …
1316 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1318 1363
1319 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1320 warn $msg; 1365 warn $msg;
1321 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1322 exit 1;
1323 } 1367 }
1324 1368
1325 warn $msg; 1369 warn $msg;
1326 } 1370 }
1327 1371
… …
1416 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1461 or return;
1418 1462
1419 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1420 or return; 1464 or return;
1465
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1424 } 1469 }
1425 } 1470 }
… …
1435 1480
1436 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1437 1482
1438 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1439 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1440 1487
1441 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1489 cf::cede_to_tick;
1443} 1490}
1444 1491
… …
1480 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1481 $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
1482 1529
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1484 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1486 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1487 1536
1488 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1528 1577
1529 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1530 my $path = path $login; 1579 my $path = path $login;
1531 1580
1532 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1587 }
1538 1588
… …
1737our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1739 1789
1740sub generate_random_map { 1790sub generate_random_map {
1741 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
1742 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1743 $self->_create_random_map ( 1796 $self->_create_random_map (
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1868 1921
1869# the temporary/swap location 1922# the temporary/swap location
1870sub save_path { 1923sub save_path {
1871 my ($self) = @_; 1924 my ($self) = @_;
1872 1925
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1875} 1928}
1876 1929
1877# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1878sub uniq_path { 1931sub uniq_path {
1879 my ($self) = @_; 1932 my ($self) = @_;
1880 1933
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1883} 1936}
1884 1937
1885# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1886# all maps in C++... 1939# all maps in C++...
… …
1984 2037
1985 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1987 2040
1988 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 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";
1991 2044
1992 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1993 or return; 2046 or return;
1994 2047
1995 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
1998 or return; 2051 or return;
1999 2052
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2003 undef $guard1; 2057 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 2058 $map->reset;
2006 return find $path; 2059 return find $path;
2007 } 2060 }
2008 2061
2009 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2090 $f->skip_block;
2038 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2039 or return; 2092 or return;
2040 2093
2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2042 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2043 2096
2044 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2098 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2072 } 2125 }
2073 2126
2074 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2076 2129
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2131 }
2079 2132
2080 $self->post_load; 2133 $self->post_load;
2081} 2134}
2082 2135
… …
2140 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2141 2194
2142 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2143 2196
2144 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2199 }
2147 2200
2148 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2149 2202
2150 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
… …
2187 cf::async { 2240 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2190 }; 2243 };
2191 2244
2245 cf::get_slot 0.02;
2246
2192 if ($uniq) { 2247 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2250 } else {
2196 $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);
… …
2204 $self->save; 2259 $self->save;
2205 2260
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2262
2208 return if $self->players; 2263 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2211 2266
2212 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2213 2268
2214 $self->deactivate; 2269 $self->deactivate;
… …
2332 2387
2333sub unique_maps() { 2388sub unique_maps() {
2334 [ 2389 [
2335 map { 2390 map {
2336 utf8::decode $_; 2391 utf8::decode $_;
2337 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2338 ? normalise $_ 2395 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2397 ]
2342} 2398}
2343 2399
2344package cf;
2345
2346=back 2400=back
2347 2401
2348=head3 cf::object 2402=head3 cf::object
2349 2403
2350=cut 2404=cut
… …
2353 2407
2354=over 4 2408=over 4
2355 2409
2356=item $ob->inv_recursive 2410=item $ob->inv_recursive
2357 2411
2358Returns 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.
2359 2414
2360=cut 2415=cut
2361 2416
2362sub inv_recursive_; 2417sub inv_recursive_;
2363sub inv_recursive_ { 2418sub inv_recursive_ {
… …
2368 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2369} 2424}
2370 2425
2371=item $ref = $ob->ref 2426=item $ref = $ob->ref
2372 2427
2373creates 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.
2374 2429
2375=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2376 2431
2377returns 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,
2378even if the object actually exists. May block. 2433even if the object actually exists. May block.
… …
2410can 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
2411dialogue with the given NPC character. 2466dialogue with the given NPC character.
2412 2467
2413=cut 2468=cut
2414 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
2415# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2485# with dialog boxes.
2417#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
2418sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2430 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2431 $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));
2432 2501
2433 } else { 2502 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2505 }
2437 } 2506 }
2438} 2507}
2439 2508
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2547Moves 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
2548her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2549that 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
2550the 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
2551be 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 >>.
2552 2624
2553=cut 2625=cut
2554 2626
2555our $GOTOGEN; 2627our $GOTOGEN;
2556 2628
… …
2635} 2707}
2636 2708
2637sub prepare_random_map { 2709sub prepare_random_map {
2638 my ($exit) = @_; 2710 my ($exit) = @_;
2639 2711
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2714 # that depends on the exit object
2645 2715
2646 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2648 if ($exit->map) { 2718 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2653 } 2725 }
2654 2726
2655 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2656 2728
2657 my $data = cf::encode_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2660 2732
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 2735 undef $fh;
2664 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2665 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2668 } 2744 }
2669} 2745}
2670 2746
2671sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2673 2749
2674 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2675 2751
2676 if ($exit->slaying eq "/!") {
2677 #TODO: this should de-fi-ni-te-ly not be a sync-job
2678 # the problem is that $exit might not survive long enough
2679 # so it needs to be done right now, right here
2680 cf::sync_job { prepare_random_map $exit };
2681 }
2682
2683 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2684 my $hp = $exit->stats->hp;
2685 my $sp = $exit->stats->sp;
2686
2687 $self->enter_link; 2752 $self->enter_link;
2688 2753
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2693 (async { 2754 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2695 2756
2696 $self->deactivate_recursive; # just to be sure
2697 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
2698 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2699 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
2700 1; 2778 1
2701 }) { 2779 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2703 . "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. "
2704 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2785 id => "infobox", 2863 id => "infobox",
2786 title => "Map Info", 2864 title => "Map Info",
2787 reply => undef, 2865 reply => undef,
2788 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2789 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2790); 2874);
2791 2875
2792sub cf::client::send_msg { 2876sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2794 2878
… …
3031 3115
3032The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3033 3117
3034 cf::object 3118 cf::object
3035 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
3036 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3037 3121
3038 cf::object::player 3122 cf::object::player
3039 player 3123 player
3040 3124
3041 cf::player 3125 cf::player
… …
3046 3130
3047=cut 3131=cut
3048 3132
3049for ( 3133for (
3050 ["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
3051 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3053 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3055 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3056) { 3140) {
3057 no strict 'refs'; 3141 no strict 'refs';
… …
3265 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3267 } 3351 }
3268}; 3352};
3269 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
3270sub reload_regions { 3364sub reload_regions {
3271 # 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
3272 # for this (global event?) 3366 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3274 3368
… …
3287} 3381}
3288 3382
3289sub reload_archetypes { 3383sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
3297} 3386}
3298 3387
3299sub reload_treasures { 3388sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3302} 3391}
3303 3392
3304sub reload_resources { 3393sub reload_resources {
3305 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3306 3395
3396 reload_facedata;
3397 reload_archetypes;
3307 reload_regions; 3398 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3399 reload_treasures;
3312 3400
3313 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3314} 3402}
3315 3403
3316sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3317 reload_resources; 3409 reload_resources;
3318} 3410}
3319 3411
3320sub reload_config { 3412sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3349 }; 3441 };
3350 3442
3443 {
3444 my $guard = freeze_mainloop;
3351 reload_config; 3445 reload_config;
3352 db_init; 3446 db_init;
3353 load_extensions; 3447 load_extensions;
3354 3448
3355 $TICK_WATCHER->start;
3356 $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
3357 EV::loop; 3452 EV::loop;
3358} 3453}
3359 3454
3360############################################################################# 3455#############################################################################
3361# initialisation and cleanup 3456# initialisation and cleanup
… …
3368 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3369 }; 3464 };
3370 } 3465 }
3371} 3466}
3372 3467
3373sub write_runtime { 3468sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3375 3470
3376 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3378 3473
… …
3404 and return; 3499 and return;
3405 3500
3406 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3407 3502
3408 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 };
3409} 3547}
3410 3548
3411sub emergency_save() { 3549sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3413 3551
… …
3435 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3436 3574
3437 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3439 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";
3440 }; 3582 };
3441 3583
3442 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3443} 3585}
3444 3586
… …
3446 my ($make_core) = @_; 3588 my ($make_core) = @_;
3447 3589
3448 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3449 if $make_core; 3591 if $make_core;
3450} 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
3451 3621
3452sub do_reload_perl() { 3622sub do_reload_perl() {
3453 # can/must only be called in main 3623 # can/must only be called in main
3454 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3455 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3456 return; 3626 return;
3457 } 3627 }
3458 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3459 warn "reloading..."; 3632 warn "reloading...";
3460 3633
3461 warn "entering sync_job"; 3634 warn "entering sync_job";
3462 3635
3463 cf::sync_job { 3636 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3465 cf::emergency_save; 3638 cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3467 3640
3468 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3470 3643
3471 # 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
3472 3645
3473 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3474 for (;;) {
3475 BDB::flush;
3476 IO::AIO::flush;
3477 Coro::cede_notself;
3478 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3479 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3480 }
3481
3482 ++$RELOAD;
3483
3484 warn "cancelling all extension coros";
3485 $_->cancel for values %EXT_CORO;
3486 %EXT_CORO = ();
3487
3488 warn "removing commands";
3489 %COMMAND = ();
3490
3491 warn "removing ext/exti commands";
3492 %EXTCMD = ();
3493 %EXTICMD = ();
3494
3495 warn "unloading/nuking all extensions";
3496 for my $pkg (@EXTS) {
3497 warn "... unloading $pkg";
3498
3499 if (my $cb = $pkg->can ("unload")) {
3500 eval {
3501 $cb->($pkg);
3502 1
3503 } or warn "$pkg unloaded, but with errors: $@";
3504 } 3649 }
3505 3650
3506 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3507 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3508 } 3653 %EXT_CORO = ();
3509 3654
3510 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3511 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3512 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3513 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3514 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3515 delete $INC{$k};
3516 3665
3517 $k =~ s/\.pm$//;
3518 $k =~ s/\//::/g;
3519
3520 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3521 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3522 } 3675 }
3523 3676
3524 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;
3525 } 3692 }
3526 3693
3527 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3528 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3529 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);
3530 3697
3531 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3532 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3533 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3534 3701
3535 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3536 # and global variables created in xs 3703 # and global variables created in xs
3537 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3538 3705
3539 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3540 3707
3541 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3542 require cf; 3709 require cf;
3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3544 3711
3545 warn "loading config and database again"; 3712 warn "loading config and database again";
3546 cf::reload_config; 3713 cf::reload_config;
3547 3714
3548 warn "loading extensions"; 3715 warn "loading extensions";
3549 cf::load_extensions; 3716 cf::load_extensions;
3550 3717
3551 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3552 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3553 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3554 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3555 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3556 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3557 3724
3558 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3559 3726
3560 1 3727 1
3561 } or do { 3728 } or do {
3562 warn $@; 3729 warn $@;
3563 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3564 exit 1;
3565 }; 3731 };
3566 3732
3567 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3568}; 3736};
3569 3737
3570our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3571 3739
3572sub reload_perl() { 3740sub reload_perl() {
… …
3597 3765
3598our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3600 3768
3601sub wait_for_tick { 3769sub wait_for_tick {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3604 3771
3605 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 3774 $signal->wait;
3608} 3775}
3609 3776
3610sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3613 3779
3614 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 3782 $signal->wait;
3617} 3783}
3618 3784
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3785sub tick {
3620 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3621 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"
3622 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3623 return; 3789 return;
3624 } 3790 }
3625 3791
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 3793
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $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.;
3635 Coro::async_pool { 3796 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 3797 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 3798 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3639 }; 3800 };
3640 } 3801 }
3641 3802
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3644 } 3805 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 3807 $sig->send;
3647 } 3808 }
3648 3809
3649 $LOAD = ($NOW - $tick_start) / $TICK; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 3812
3652 _post_tick; 3813 if (0) {
3653}; 3814 if ($NEXT_TICK) {
3654$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}
3655 3821
3656{ 3822{
3657 # configure BDB 3823 # configure BDB
3658 3824
3659 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3660 BDB::max_poll_reqs $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 3827 $AnyEvent::BDB::WATCHER->priority (1);
3662 3828
3663 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3666 | 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;
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3669 3836
3670 cf::sync_job { 3837 cf::sync_job {
3671 eval { 3838 eval {
… …
3697{ 3864{
3698 # configure IO::AIO 3865 # configure IO::AIO
3699 3866
3700 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 3869 undef $AnyEvent::AIO::WATCHER;
3703} 3870}
3704 3871
3705my $_log_backtrace; 3872my $_log_backtrace;
3706 3873
3707sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

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