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.407 by root, Sun Jan 13 09:53:53 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::Syck (); 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
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 69
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 71
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 73
… …
72our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE; 97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
82 103
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 107our $DB_ENV;
88 108
… …
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
… …
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
198 219
199$Coro::State::DIEHOOK = sub { 220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
200 warn Carp::longmess $_[0]; 229 warn Carp::longmess $_[0];
201 Coro::terminate; 230 Coro::terminate
202}; 231};
232
233$SIG{__DIE__} = sub { }; #d#?
203 234
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
214for my $pkg (qw( 245for my $pkg (qw(
215 cf::global cf::attachable 246 cf::global cf::attachable
216 cf::object cf::object::player 247 cf::object cf::object::player
217 cf::client cf::player 248 cf::client cf::player
218 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
219 cf::map cf::party cf::region 251 cf::party cf::region
220)) { 252)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 254}
224 255
225$EV::DIED = sub { 256$EV::DIED = sub {
226 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
332 363
333 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
334} 365}
335 366
336sub freeze_mainloop { 367sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
338 369
339 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 371}
345 372
346=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
347 374
348Like 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
… …
403 } 430 }
404 } 431 }
405}; 432};
406 433
407sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
408 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
409 438
410 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
411 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
412 441
… …
449 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
451 480
452 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
453 482
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
457 484
458 my $busy = 1; 485 my $busy = 1;
459 my @res; 486 my @res;
460 487
… …
471 } else { 498 } else {
472 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
473 } 500 }
474 } 501 }
475 502
476 $time = EV::time - $time; 503 my $time = EV::time - $time;
477 504
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
482 506
483 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
484 } else { 508 } else {
485 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
486 510
… …
528 reset_signals; 552 reset_signals;
529 &$cb 553 &$cb
530 }, @args; 554 }, @args;
531 555
532 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
533} 584}
534 585
535=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
536 587
537Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
1037 1088
1038sub reattach { 1089sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1091 my ($obj) = @_;
1041 1092
1093 # no longer needed after getting rid of delete_package?
1042 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
1043 1095
1044 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1045 1097
1046 @$registry = (); 1098 @$registry = ();
1047 1099
… …
1093 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1096 1148
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1101 close $fh; 1153 aio_close $fh;
1102 1154
1103 if (@$objs) { 1155 if (@$objs) {
1104 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) {
1105 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1108 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1109 close $fh; 1161 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1163 }
1112 } else { 1164 } else {
1113 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1114 } 1166 }
… …
1283 1335
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1338
1287 $ext{source} = 1339 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1289 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1290 . $source 1342 . $source
1291 . "\n};\n1"; 1343 . "\n};\n1";
1292 1344
1293 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1309 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1310 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1311 1363
1312 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1313 warn $msg; 1365 warn $msg;
1314 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1315 exit 1;
1316 } 1367 }
1317 1368
1318 warn $msg; 1369 warn $msg;
1319 } 1370 }
1320 1371
… …
1409 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1461 or return;
1411 1462
1412 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1413 or return; 1464 or return;
1465
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1417 } 1469 }
1418 } 1470 }
… …
1428 1480
1429 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1430 1482
1431 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1433 1487
1434 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1489 cf::cede_to_tick;
1436} 1490}
1437 1491
… …
1473 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1474 $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
1475 1529
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1479 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1480 1536
1481 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1521 1577
1522 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1523 my $path = path $login; 1579 my $path = path $login;
1524 1580
1525 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1587 }
1531 1588
… …
1730our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1732 1789
1733sub generate_random_map { 1790sub generate_random_map {
1734 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
1735 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1796 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1861 1921
1862# the temporary/swap location 1922# the temporary/swap location
1863sub save_path { 1923sub save_path {
1864 my ($self) = @_; 1924 my ($self) = @_;
1865 1925
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1868} 1928}
1869 1929
1870# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1871sub uniq_path { 1931sub uniq_path {
1872 my ($self) = @_; 1932 my ($self) = @_;
1873 1933
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1876} 1936}
1877 1937
1878# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1879# all maps in C++... 1939# all maps in C++...
… …
1977 2037
1978 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1980 2040
1981 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 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";
1984 2044
1985 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1986 or return; 2046 or return;
1987 2047
1988 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
1991 or return; 2051 or return;
1992 2052
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
1996 undef $guard1; 2057 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2058 $map->reset;
1999 return find $path; 2059 return find $path;
2000 } 2060 }
2001 2061
2002 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2090 $f->skip_block;
2031 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2032 or return; 2092 or return;
2033 2093
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2035 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2036 2096
2037 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2098 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2065 } 2125 }
2066 2126
2067 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2069 2129
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2131 }
2072 2132
2073 $self->post_load; 2133 $self->post_load;
2074} 2134}
2075 2135
… …
2133 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2134 2194
2135 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2136 2196
2137 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2199 }
2140 2200
2141 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2142 2202
2143 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
… …
2180 cf::async { 2240 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2183 }; 2243 };
2184 2244
2245 cf::get_slot 0.02;
2246
2185 if ($uniq) { 2247 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2250 } else {
2189 $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);
… …
2197 $self->save; 2259 $self->save;
2198 2260
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2262
2201 return if $self->players; 2263 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2203 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2204 2266
2205 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2206 2268
2207 $self->deactivate; 2269 $self->deactivate;
… …
2325 2387
2326sub unique_maps() { 2388sub unique_maps() {
2327 [ 2389 [
2328 map { 2390 map {
2329 utf8::decode $_; 2391 utf8::decode $_;
2330 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2331 ? normalise $_ 2395 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2397 ]
2335} 2398}
2336 2399
2337package cf;
2338
2339=back 2400=back
2340 2401
2341=head3 cf::object 2402=head3 cf::object
2342 2403
2343=cut 2404=cut
… …
2346 2407
2347=over 4 2408=over 4
2348 2409
2349=item $ob->inv_recursive 2410=item $ob->inv_recursive
2350 2411
2351Returns 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.
2352 2414
2353=cut 2415=cut
2354 2416
2355sub inv_recursive_; 2417sub inv_recursive_;
2356sub inv_recursive_ { 2418sub inv_recursive_ {
… …
2361 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2362} 2424}
2363 2425
2364=item $ref = $ob->ref 2426=item $ref = $ob->ref
2365 2427
2366creates 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.
2367 2429
2368=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2369 2431
2370returns 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,
2371even if the object actually exists. May block. 2433even if the object actually exists. May block.
… …
2403can 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
2404dialogue with the given NPC character. 2466dialogue with the given NPC character.
2405 2467
2406=cut 2468=cut
2407 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
2408# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2485# with dialog boxes.
2410#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
2411sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2423 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2424 $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));
2425 2501
2426 } else { 2502 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2505 }
2430 } 2506 }
2431} 2507}
2432 2508
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2540Moves 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
2541her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2542that 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
2543the 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
2544be 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 >>.
2545 2624
2546=cut 2625=cut
2547 2626
2548our $GOTOGEN; 2627our $GOTOGEN;
2549 2628
… …
2628} 2707}
2629 2708
2630sub prepare_random_map { 2709sub prepare_random_map {
2631 my ($exit) = @_; 2710 my ($exit) = @_;
2632 2711
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2714 # that depends on the exit object
2638 2715
2639 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2641 if ($exit->map) { 2718 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2646 } 2725 }
2647 2726
2648 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2649 2728
2650 my $data = cf::encode_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2653 2732
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2735 undef $fh;
2657 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2658 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2661 } 2744 }
2662} 2745}
2663 2746
2664sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2666 2749
2667 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2668 2751
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2752 $self->enter_link;
2681 2753
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2754 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2688 2756
2689 $self->deactivate_recursive; # just to be sure
2690 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
2691 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2692 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
2693 1; 2778 1
2694 }) { 2779 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2696 . "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. "
2697 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2778 id => "infobox", 2863 id => "infobox",
2779 title => "Map Info", 2864 title => "Map Info",
2780 reply => undef, 2865 reply => undef,
2781 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2782 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2783); 2874);
2784 2875
2785sub cf::client::send_msg { 2876sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2787 2878
… …
3024 3115
3025The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3026 3117
3027 cf::object 3118 cf::object
3028 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
3029 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3030 3121
3031 cf::object::player 3122 cf::object::player
3032 player 3123 player
3033 3124
3034 cf::player 3125 cf::player
… …
3039 3130
3040=cut 3131=cut
3041 3132
3042for ( 3133for (
3043 ["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
3044 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3046 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3048 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3049) { 3140) {
3050 no strict 'refs'; 3141 no strict 'refs';
… …
3258 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3260 } 3351 }
3261}; 3352};
3262 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
3263sub reload_regions { 3364sub reload_regions {
3264 # 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
3265 # for this (global event?) 3366 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3368
… …
3280} 3381}
3281 3382
3282sub reload_archetypes { 3383sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3386}
3291 3387
3292sub reload_treasures { 3388sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3295} 3391}
3296 3392
3297sub reload_resources { 3393sub reload_resources {
3298 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3299 3395
3396 reload_facedata;
3397 reload_archetypes;
3300 reload_regions; 3398 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3399 reload_treasures;
3305 3400
3306 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3307} 3402}
3308 3403
3309sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3310 reload_resources; 3409 reload_resources;
3311} 3410}
3312 3411
3313sub reload_config { 3412sub reload_config {
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
3315 or return; 3414 or return;
3316 3415
3317 local $/; 3416 local $/;
3318 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
3319 3418
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3321 3420
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3342 }; 3441 };
3343 3442
3443 {
3444 my $guard = freeze_mainloop;
3344 reload_config; 3445 reload_config;
3345 db_init; 3446 db_init;
3346 load_extensions; 3447 load_extensions;
3347 3448
3348 $TICK_WATCHER->start;
3349 $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
3350 EV::loop; 3452 EV::loop;
3351} 3453}
3352 3454
3353############################################################################# 3455#############################################################################
3354# initialisation and cleanup 3456# initialisation and cleanup
… …
3361 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3362 }; 3464 };
3363 } 3465 }
3364} 3466}
3365 3467
3366sub write_runtime { 3468sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3368 3470
3369 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3371 3473
… …
3397 and return; 3499 and return;
3398 3500
3399 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3400 3502
3401 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 };
3402} 3547}
3403 3548
3404sub emergency_save() { 3549sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3406 3551
… …
3428 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3429 3574
3430 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3432 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";
3433 }; 3582 };
3434 3583
3435 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3436} 3585}
3437 3586
… …
3439 my ($make_core) = @_; 3588 my ($make_core) = @_;
3440 3589
3441 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3591 if $make_core;
3443} 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
3444 3621
3445sub do_reload_perl() { 3622sub do_reload_perl() {
3446 # can/must only be called in main 3623 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3448 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3449 return; 3626 return;
3450 } 3627 }
3451 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3452 warn "reloading..."; 3632 warn "reloading...";
3453 3633
3454 warn "entering sync_job"; 3634 warn "entering sync_job";
3455 3635
3456 cf::sync_job { 3636 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3458 cf::emergency_save; 3638 cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3460 3640
3461 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3463 3643
3464 # 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
3465 3645
3466 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3472 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = ();
3480
3481 warn "removing commands";
3482 %COMMAND = ();
3483
3484 warn "removing ext/exti commands";
3485 %EXTCMD = ();
3486 %EXTICMD = ();
3487
3488 warn "unloading/nuking all extensions";
3489 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg";
3491
3492 if (my $cb = $pkg->can ("unload")) {
3493 eval {
3494 $cb->($pkg);
3495 1
3496 } or warn "$pkg unloaded, but with errors: $@";
3497 } 3649 }
3498 3650
3499 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3500 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3501 } 3653 %EXT_CORO = ();
3502 3654
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3504 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3507 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3508 delete $INC{$k};
3509 3665
3510 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g;
3512
3513 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3514 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3515 } 3675 }
3516 3676
3517 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;
3518 } 3692 }
3519 3693
3520 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3522 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);
3523 3697
3524 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3527 3701
3528 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3703 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3531 3705
3532 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3533 3707
3534 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3535 require cf; 3709 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3537 3711
3538 warn "loading config and database again"; 3712 warn "loading config and database again";
3539 cf::reload_config; 3713 cf::reload_config;
3540 3714
3541 warn "loading extensions"; 3715 warn "loading extensions";
3542 cf::load_extensions; 3716 cf::load_extensions;
3543 3717
3544 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3550 3724
3551 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3552 3726
3553 1 3727 1
3554 } or do { 3728 } or do {
3555 warn $@; 3729 warn $@;
3556 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3557 exit 1;
3558 }; 3731 };
3559 3732
3560 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3561}; 3736};
3562 3737
3563our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3564 3739
3565sub reload_perl() { 3740sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3568 3743
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3745 do_reload_perl;
3570 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3571 do_reload_perl;
3572 }; 3747 };
3573} 3748}
3574 3749
3575register_command "reload" => sub { 3750register_command "reload" => sub {
3576 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
… …
3590 3765
3591our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3593 3768
3594sub wait_for_tick { 3769sub wait_for_tick {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3771
3598 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 3774 $signal->wait;
3601} 3775}
3602 3776
3603sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3606 3779
3607 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 3782 $signal->wait;
3610} 3783}
3611 3784
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3785sub tick {
3613 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3614 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"
3615 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3616 return; 3789 return;
3617 } 3790 }
3618 3791
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3622
3623 $RUNTIME += $TICK;
3624 $NEXT_TICK = $_[0]->at;
3625 3793
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $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.;
3628 Coro::async_pool { 3796 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 3797 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 3798 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3632 }; 3800 };
3633 } 3801 }
3634 3802
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3637 } 3805 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 3807 $sig->send;
3640 } 3808 }
3641 3809
3642 $LOAD = ($NOW - $tick_start) / $TICK; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 3812
3645 _post_tick; 3813 if (0) {
3646}; 3814 if ($NEXT_TICK) {
3647$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}
3648 3821
3649{ 3822{
3650 # configure BDB 3823 # configure BDB
3651 3824
3652 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3653 BDB::max_poll_reqs $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 3827 $AnyEvent::BDB::WATCHER->priority (1);
3655 3828
3656 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | 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;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 3836
3663 cf::sync_job { 3837 cf::sync_job {
3664 eval { 3838 eval {
… …
3690{ 3864{
3691 # configure IO::AIO 3865 # configure IO::AIO
3692 3866
3693 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 3869 undef $AnyEvent::AIO::WATCHER;
3696} 3870}
3697 3871
3698my $_log_backtrace; 3872my $_log_backtrace;
3699 3873
3700sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

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