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.400 by root, Mon Dec 17 06:36:34 2007 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; 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
… …
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
74 98
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 101our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
81 103
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 107our $DB_ENV;
87 108
… …
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 121
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
104 126
105binmode STDOUT; 127binmode STDOUT;
106binmode STDERR; 128binmode STDERR;
107 129
108# read virtual server time, if available 130# read virtual server time, if available
… …
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 215
194 LOG llevError, $msg; 216 LOG llevError, $msg;
195 }; 217 };
196} 218}
219
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
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
197 234
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
208for my $pkg (qw( 245for my $pkg (qw(
209 cf::global cf::attachable 246 cf::global cf::attachable
210 cf::object cf::object::player 247 cf::object cf::object::player
211 cf::client cf::player 248 cf::client cf::player
212 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
213 cf::map cf::party cf::region 251 cf::party cf::region
214)) { 252)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 254}
218 255
219$EV::DIED = sub { 256$EV::DIED = sub {
220 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
326 363
327 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
328} 365}
329 366
330sub freeze_mainloop { 367sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
332 369
333 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 371}
339 372
340=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
341 374
342Like 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
… …
397 } 430 }
398 } 431 }
399}; 432};
400 433
401sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
402 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
403 438
404 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
406 441
… …
443 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
445 480
446 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
447 482
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
451 484
452 my $busy = 1; 485 my $busy = 1;
453 my @res; 486 my @res;
454 487
… …
465 } else { 498 } else {
466 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
467 } 500 }
468 } 501 }
469 502
470 $time = EV::time - $time; 503 my $time = EV::time - $time;
471 504
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
476 506
477 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
478 } else { 508 } else {
479 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
480 510
… …
522 reset_signals; 552 reset_signals;
523 &$cb 553 &$cb
524 }, @args; 554 }, @args;
525 555
526 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
527} 584}
528 585
529=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
530 587
531Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
968 } 1025 }
969 1026
970 0 1027 0
971} 1028}
972 1029
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1031
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1033
977Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
978 1035
… …
1031 1088
1032sub reattach { 1089sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1091 my ($obj) = @_;
1035 1092
1093 # no longer needed after getting rid of delete_package?
1036 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
1037 1095
1038 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1039 1097
1040 @$registry = (); 1098 @$registry = ();
1041 1099
… …
1087 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1090 1148
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1095 close $fh; 1153 aio_close $fh;
1096 1154
1097 if (@$objs) { 1155 if (@$objs) {
1098 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) {
1099 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1102 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1103 close $fh; 1161 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1163 }
1106 } else { 1164 } else {
1107 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1108 } 1166 }
… …
1277 1335
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1338
1281 $ext{source} = 1339 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1284 . $source 1342 . $source
1285 . "\n};\n1"; 1343 . "\n};\n1";
1286 1344
1287 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1303 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1305 1363
1306 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1307 warn $msg; 1365 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1309 exit 1;
1310 } 1367 }
1311 1368
1312 warn $msg; 1369 warn $msg;
1313 } 1370 }
1314 1371
… …
1403 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1461 or return;
1405 1462
1406 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1407 or return; 1464 or return;
1465
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1411 } 1469 }
1412 } 1470 }
… …
1422 1480
1423 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1424 1482
1425 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1427 1487
1428 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1489 cf::cede_to_tick;
1430} 1490}
1431 1491
… …
1467 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1468 $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
1469 1529
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1474 1536
1475 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1515 1577
1516 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1517 my $path = path $login; 1579 my $path = path $login;
1518 1580
1519 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1587 }
1525 1588
… …
1724our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1726 1789
1727sub generate_random_map { 1790sub generate_random_map {
1728 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
1729 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1796 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1855 1921
1856# the temporary/swap location 1922# the temporary/swap location
1857sub save_path { 1923sub save_path {
1858 my ($self) = @_; 1924 my ($self) = @_;
1859 1925
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1862} 1928}
1863 1929
1864# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1865sub uniq_path { 1931sub uniq_path {
1866 my ($self) = @_; 1932 my ($self) = @_;
1867 1933
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1870} 1936}
1871 1937
1872# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1873# all maps in C++... 1939# all maps in C++...
… …
1971 2037
1972 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1974 2040
1975 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 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";
1978 2044
1979 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1980 or return; 2046 or return;
1981 2047
1982 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
1985 or return; 2051 or return;
1986 2052
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
1990 undef $guard1; 2057 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 2058 $map->reset;
1993 return find $path; 2059 return find $path;
1994 } 2060 }
1995 2061
1996 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2090 $f->skip_block;
2025 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2026 or return; 2092 or return;
2027 2093
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2029 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2030 2096
2031 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2098 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2059 } 2125 }
2060 2126
2061 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2063 2129
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2131 }
2066 2132
2067 $self->post_load; 2133 $self->post_load;
2068} 2134}
2069 2135
… …
2127 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2128 2194
2129 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2130 2196
2131 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2199 }
2134 2200
2135 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2136 2202
2137 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
… …
2174 cf::async { 2240 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2177 }; 2243 };
2178 2244
2245 cf::get_slot 0.02;
2246
2179 if ($uniq) { 2247 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2250 } else {
2183 $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);
… …
2191 $self->save; 2259 $self->save;
2192 2260
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2262
2195 return if $self->players; 2263 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2198 2266
2199 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2200 2268
2201 $self->deactivate; 2269 $self->deactivate;
… …
2319 2387
2320sub unique_maps() { 2388sub unique_maps() {
2321 [ 2389 [
2322 map { 2390 map {
2323 utf8::decode $_; 2391 utf8::decode $_;
2324 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2325 ? normalise $_ 2395 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2397 ]
2329} 2398}
2330 2399
2331package cf;
2332
2333=back 2400=back
2334 2401
2335=head3 cf::object 2402=head3 cf::object
2336 2403
2337=cut 2404=cut
… …
2340 2407
2341=over 4 2408=over 4
2342 2409
2343=item $ob->inv_recursive 2410=item $ob->inv_recursive
2344 2411
2345Returns 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.
2346 2414
2347=cut 2415=cut
2348 2416
2349sub inv_recursive_; 2417sub inv_recursive_;
2350sub inv_recursive_ { 2418sub inv_recursive_ {
… …
2355 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2356} 2424}
2357 2425
2358=item $ref = $ob->ref 2426=item $ref = $ob->ref
2359 2427
2360creates 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.
2361 2429
2362=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2363 2431
2364returns 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,
2365even if the object actually exists. May block. 2433even if the object actually exists. May block.
… …
2397can 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
2398dialogue with the given NPC character. 2466dialogue with the given NPC character.
2399 2467
2400=cut 2468=cut
2401 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
2402# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2485# with dialog boxes.
2404#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
2405sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2417 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2418 $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));
2419 2501
2420 } else { 2502 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2505 }
2424 } 2506 }
2425} 2507}
2426 2508
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2538be 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 >>.
2539 2624
2540=cut 2625=cut
2541 2626
2542our $GOTOGEN; 2627our $GOTOGEN;
2543 2628
… …
2622} 2707}
2623 2708
2624sub prepare_random_map { 2709sub prepare_random_map {
2625 my ($exit) = @_; 2710 my ($exit) = @_;
2626 2711
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2714 # that depends on the exit object
2632 2715
2633 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2635 if ($exit->map) { 2718 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2640 } 2725 }
2641 2726
2642 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2643 2728
2644 my $data = cf::encode_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2647 2732
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2735 undef $fh;
2651 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2652 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2655 } 2744 }
2656} 2745}
2657 2746
2658sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2660 2749
2661 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2662 2751
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2752 $self->enter_link;
2675 2753
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2754 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2682 2756
2683 $self->deactivate_recursive; # just to be sure
2684 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
2685 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2686 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
2687 1; 2778 1
2688 }) { 2779 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2690 . "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. "
2691 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2772 id => "infobox", 2863 id => "infobox",
2773 title => "Map Info", 2864 title => "Map Info",
2774 reply => undef, 2865 reply => undef,
2775 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2776 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2777); 2874);
2778 2875
2779sub cf::client::send_msg { 2876sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2878
… …
3018 3115
3019The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3020 3117
3021 cf::object 3118 cf::object
3022 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
3023 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3024 3121
3025 cf::object::player 3122 cf::object::player
3026 player 3123 player
3027 3124
3028 cf::player 3125 cf::player
… …
3033 3130
3034=cut 3131=cut
3035 3132
3036for ( 3133for (
3037 ["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
3038 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3040 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3042 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3043) { 3140) {
3044 no strict 'refs'; 3141 no strict 'refs';
… …
3149 { 3246 {
3150 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
3151 3248
3152 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
3154 cf::face::set_visibility $idx, $info->{visibility}; 3252 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3253 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3256
3159 cf::cede_to_tick; 3257 cf::cede_to_tick;
3160 } 3258 }
3161 3259
3162 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
3164 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
3165 or next; 3264 or next;
3265
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3267 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3269 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3188 { 3288 {
3189 # TODO: for gcfclient pleasure, we should give resources 3289 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3290 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3291 my $res = $facedata->{resource};
3192 3292
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3296 my $data;
3198 3297
3199 if ($info->{type} & 1) { 3298 if ($info->{type} & 1) {
3200 # prepend meta info 3299 # prepend meta info
3201 3300
3202 my $meta = $enc->encode ({ 3301 my $meta = $enc->encode ({
3203 name => $name, 3302 name => $name,
3204 %{ $info->{meta} || {} }, 3303 %{ $info->{meta} || {} },
3205 }); 3304 });
3206 3305
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
3208 } else { 3313 } else {
3209 $data = $info->{data}; 3314 $RESOURCE{$name} = $info;
3210 } 3315 }
3211 3316
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3317 cf::cede_to_tick;
3216 } 3318 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3322
3237 1 3323 1
3238} 3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3239 3345
3240register_exticmd fx_want => sub { 3346register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3347 my ($ns, $want) = @_;
3242 3348
3243 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3245 } 3351 }
3246}; 3352};
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}
3247 3363
3248sub reload_regions { 3364sub reload_regions {
3249 # 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
3250 # for this (global event?) 3366 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3265} 3381}
3266 3382
3267sub reload_archetypes { 3383sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3386}
3276 3387
3277sub reload_treasures { 3388sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3280} 3391}
3281 3392
3282sub reload_resources { 3393sub reload_resources {
3283 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3284 3395
3396 reload_facedata;
3397 reload_archetypes;
3285 reload_regions; 3398 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3399 reload_treasures;
3290 3400
3291 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3292} 3402}
3293 3403
3294sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3295 reload_resources; 3409 reload_resources;
3296} 3410}
3297 3411
3298sub reload_config { 3412sub reload_config {
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3414 or return;
3301 3415
3302 local $/; 3416 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
3304 3418
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3420
3307 $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};
3308 $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};
… …
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3327 }; 3441 };
3328 3442
3443 {
3444 my $guard = freeze_mainloop;
3329 reload_config; 3445 reload_config;
3330 db_init; 3446 db_init;
3331 load_extensions; 3447 load_extensions;
3332 3448
3333 $TICK_WATCHER->start;
3334 $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
3335 EV::loop; 3452 EV::loop;
3336} 3453}
3337 3454
3338############################################################################# 3455#############################################################################
3339# initialisation and cleanup 3456# initialisation and cleanup
… …
3346 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3347 }; 3464 };
3348 } 3465 }
3349} 3466}
3350 3467
3351sub write_runtime { 3468sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3353 3470
3354 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3356 3473
… …
3382 and return; 3499 and return;
3383 3500
3384 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3385 3502
3386 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 };
3387} 3547}
3388 3548
3389sub emergency_save() { 3549sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3391 3551
… …
3413 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3414 3574
3415 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3417 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";
3418 }; 3582 };
3419 3583
3420 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3421} 3585}
3422 3586
… …
3424 my ($make_core) = @_; 3588 my ($make_core) = @_;
3425 3589
3426 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3591 if $make_core;
3428} 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
3429 3621
3430sub do_reload_perl() { 3622sub do_reload_perl() {
3431 # can/must only be called in main 3623 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3434 return; 3626 return;
3435 } 3627 }
3436 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3437 warn "reloading..."; 3632 warn "reloading...";
3438 3633
3439 warn "entering sync_job"; 3634 warn "entering sync_job";
3440 3635
3441 cf::sync_job { 3636 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3638 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3445 3640
3446 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3643
3449 # 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
3450 3645
3451 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3452 for (;;) {
3453 BDB::flush;
3454 IO::AIO::flush;
3455 Coro::cede_notself;
3456 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3458 }
3459
3460 ++$RELOAD;
3461
3462 warn "cancelling all extension coros";
3463 $_->cancel for values %EXT_CORO;
3464 %EXT_CORO = ();
3465
3466 warn "removing commands";
3467 %COMMAND = ();
3468
3469 warn "removing ext/exti commands";
3470 %EXTCMD = ();
3471 %EXTICMD = ();
3472
3473 warn "unloading/nuking all extensions";
3474 for my $pkg (@EXTS) {
3475 warn "... unloading $pkg";
3476
3477 if (my $cb = $pkg->can ("unload")) {
3478 eval {
3479 $cb->($pkg);
3480 1
3481 } or warn "$pkg unloaded, but with errors: $@";
3482 } 3649 }
3483 3650
3484 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3486 } 3653 %EXT_CORO = ();
3487 3654
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3665
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3499 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3500 } 3675 }
3501 3676
3502 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;
3503 } 3692 }
3504 3693
3505 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3507 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);
3508 3697
3509 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3512 3701
3513 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3703 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3516 3705
3517 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3518 3707
3519 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3520 require cf; 3709 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3522 3711
3523 warn "loading config and database again"; 3712 warn "loading config and database again";
3524 cf::reload_config; 3713 cf::reload_config;
3525 3714
3526 warn "loading extensions"; 3715 warn "loading extensions";
3527 cf::load_extensions; 3716 cf::load_extensions;
3528 3717
3529 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3535 3724
3536 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3537 3726
3538 1 3727 1
3539 } or do { 3728 } or do {
3540 warn $@; 3729 warn $@;
3541 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3731 };
3544 3732
3545 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3546}; 3736};
3547 3737
3548our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3549 3739
3550sub reload_perl() { 3740sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3553 3743
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3745 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3556 do_reload_perl;
3557 }; 3747 };
3558} 3748}
3559 3749
3560register_command "reload" => sub { 3750register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
… …
3575 3765
3576our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3578 3768
3579sub wait_for_tick { 3769sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3771
3583 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3774 $signal->wait;
3586} 3775}
3587 3776
3588sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3779
3592 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3782 $signal->wait;
3595} 3783}
3596 3784
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3785sub tick {
3598 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3599 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"
3600 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3601 return; 3789 return;
3602 } 3790 }
3603 3791
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3607 3793
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK += $TICK;
3610
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = $NOW + 10; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3796 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3797 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3798 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3800 };
3618 } 3801 }
3619 3802
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3622 } 3805 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3807 $sig->send;
3625 } 3808 }
3626 3809
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3812
3630 _post_tick; 3813 if (0) {
3631}; 3814 if ($NEXT_TICK) {
3632$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}
3633 3821
3634{ 3822{
3823 # configure BDB
3824
3635 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3636 BDB::max_poll_reqs $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3827 $AnyEvent::BDB::WATCHER->priority (1);
3637 3828
3638 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3639 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3640 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3641 | 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;
3642 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3643 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3644 3836
3645 cf::sync_job { 3837 cf::sync_job {
3646 eval { 3838 eval {
… …
3668 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3669 }; 3861 };
3670} 3862}
3671 3863
3672{ 3864{
3865 # configure IO::AIO
3866
3673 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3674
3675 undef $Coro::AIO::WATCHER;
3676 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3677 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3869 undef $AnyEvent::AIO::WATCHER;
3678} 3870}
3679 3871
3680my $_log_backtrace; 3872my $_log_backtrace;
3681 3873
3682sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

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