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.396 by root, Wed Nov 14 08:09:46 2007 UTC vs.
Revision 1.434 by root, Thu May 29 03:27:37 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
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
… …
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.1 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::EV; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.51 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
61
62IO::AIO::max_poll_reqs 1;#d#
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::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
41Compress::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
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 69
46$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
47 71
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 73
… …
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
73 98
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 101our $NEXT_TICK;
79our $NOW;
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
88our %CFG; 109our %CFG;
89 110
90our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 112our $RUNTIME;
113our $NOW;
92 114
93our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
96 118
97# 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 ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 121
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
103 126
104binmode STDOUT; 127binmode STDOUT;
105binmode STDERR; 128binmode STDERR;
106 129
107# read virtual server time, if available 130# read virtual server time, if available
… …
191 $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;
192 215
193 LOG llevError, $msg; 216 LOG llevError, $msg;
194 }; 217 };
195} 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#?
196 234
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 285 $d
248 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
249} 287}
250 288
251=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
252 290
253Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
254 292
255=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
256 294
257Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
258 296
259=cut 297=cut
260 298
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 300
263sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
265 303
266=item cf::lock_wait $string 304=item cf::lock_wait $string
267 305
268Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
269 307
… …
325 363
326 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
327} 365}
328 366
329sub freeze_mainloop { 367sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
331 369
332 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 371}
338 372
339=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
340 374
341Like 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
… …
396 } 430 }
397 } 431 }
398}; 432};
399 433
400sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
401 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
402 438
403 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
405 441
… …
442 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
444 480
445 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
446 482
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
450 484
451 my $busy = 1; 485 my $busy = 1;
452 my @res; 486 my @res;
453 487
… …
464 } else { 498 } else {
465 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
466 } 500 }
467 } 501 }
468 502
469 $time = EV::time - $time; 503 my $time = EV::time - $time;
470 504
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
475 506
476 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
477 } else { 508 } else {
478 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
479 510
… …
521 reset_signals; 552 reset_signals;
522 &$cb 553 &$cb
523 }, @args; 554 }, @args;
524 555
525 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
526} 584}
527 585
528=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
529 587
530Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
967 } 1025 }
968 1026
969 0 1027 0
970} 1028}
971 1029
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1031
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1033
976Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
977 1035
… …
1055cf::attachable->attach ( 1113cf::attachable->attach (
1056 prio => -1000000, 1114 prio => -1000000,
1057 on_instantiate => sub { 1115 on_instantiate => sub {
1058 my ($obj, $data) = @_; 1116 my ($obj, $data) = @_;
1059 1117
1060 $data = from_json $data; 1118 $data = decode_json $data;
1061 1119
1062 for (@$data) { 1120 for (@$data) {
1063 my ($name, $args) = @$_; 1121 my ($name, $args) = @$_;
1064 1122
1065 $obj->attach ($name, %{$args || {} }); 1123 $obj->attach ($name, %{$args || {} });
… …
1086 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1145 warn sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1146 $decname, length $$rdata, scalar @$objs;
1089 1147
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1149 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1151 aio_fsync $fh if $cf::USE_FSYNC;
1094 close $fh; 1152 aio_close $fh;
1095 1153
1096 if (@$objs) { 1154 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1158 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
1102 close $fh; 1160 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1161 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1162 }
1105 } else { 1163 } else {
1106 aio_unlink "$filename.pst"; 1164 aio_unlink "$filename.pst";
1107 } 1165 }
… …
1302 my $msg = $@ ? "$v->{path}: $@\n" 1360 my $msg = $@ ? "$v->{path}: $@\n"
1303 : "$v->{base}: extension inactive.\n"; 1361 : "$v->{base}: extension inactive.\n";
1304 1362
1305 if (exists $v->{meta}{mandatory}) { 1363 if (exists $v->{meta}{mandatory}) {
1306 warn $msg; 1364 warn $msg;
1307 warn "mandatory extension failed to load, exiting.\n"; 1365 cf::cleanup "mandatory extension failed to load, exiting.";
1308 exit 1;
1309 } 1366 }
1310 1367
1311 warn $msg; 1368 warn $msg;
1312 } 1369 }
1313 1370
… …
1402 my $f = new_from_file cf::object::thawer path $login 1459 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1460 or return;
1404 1461
1405 my $pl = cf::player::load_pl $f 1462 my $pl = cf::player::load_pl $f
1406 or return; 1463 or return;
1464
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1465 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1466 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1467 $cf::PLAYER{$login} = $pl
1410 } 1468 }
1411 } 1469 }
… …
1421 1479
1422 return if $pl->{deny_save}; 1480 return if $pl->{deny_save};
1423 1481
1424 aio_mkdir playerdir $pl, 0770; 1482 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1483 $pl->{last_save} = $cf::RUNTIME;
1484
1485 cf::get_slot 0.01;
1426 1486
1427 $pl->save_pl ($path); 1487 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1488 cf::cede_to_tick;
1429} 1489}
1430 1490
… …
1466 $pl->{deny_save} = 1; 1526 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1527 $pl->password ("*"); # this should lock out the player until we nuked the dir
1468 1528
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1530 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1533 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1534 $pl->ns->destroy if $pl->ns;
1473 1535
1474 my $path = playerdir $pl; 1536 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1537 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1514 1576
1515 for my $login (@$dirs) { 1577 for my $login (@$dirs) {
1516 my $path = path $login; 1578 my $path = path $login;
1517 1579
1518 # a .pst is a dead give-away for a valid player 1580 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1581 # if no pst file found, open and chekc for blocked users
1582 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1583 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1584 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1585 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1586 }
1524 1587
… …
1723our $MAX_RESET = 3600; 1786our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1787our $DEFAULT_RESET = 3000;
1725 1788
1726sub generate_random_map { 1789sub generate_random_map {
1727 my ($self, $rmp) = @_; 1790 my ($self, $rmp) = @_;
1791
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793
1728 # mit "rum" bekleckern, nicht 1794 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1795 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1854 1920
1855# the temporary/swap location 1921# the temporary/swap location
1856sub save_path { 1922sub save_path {
1857 my ($self) = @_; 1923 my ($self) = @_;
1858 1924
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1925 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1926 "$TMPDIR/$path.map"
1861} 1927}
1862 1928
1863# the unique path, undef == no special unique path 1929# the unique path, undef == no special unique path
1864sub uniq_path { 1930sub uniq_path {
1865 my ($self) = @_; 1931 my ($self) = @_;
1866 1932
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1934 "$UNIQUEDIR/$path"
1869} 1935}
1870 1936
1871# and all this just because we cannot iterate over 1937# and all this just because we cannot iterate over
1872# all maps in C++... 1938# all maps in C++...
… …
1970 2036
1971 cf::lock_wait "map_data:$path";#d#remove 2037 cf::lock_wait "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2038 cf::lock_wait "map_find:$path";
1973 2039
1974 $cf::MAP{$path} || do { 2040 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2043
1978 my $map = new_from_path cf::map $path 2044 my $map = new_from_path cf::map $path
1979 or return; 2045 or return;
1980 2046
1981 $map->{last_save} = $cf::RUNTIME; 2047 $map->{last_save} = $cf::RUNTIME;
… …
1984 or return; 2050 or return;
1985 2051
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2052 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2053 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2054 #$cf::WAIT_FOR_TICK->wait;
2055 undef $guard2;
1989 undef $guard1; 2056 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2057 $map->reset;
1992 return find $path; 2058 return find $path;
1993 } 2059 }
1994 2060
1995 $cf::MAP{$path} = $map 2061 $cf::MAP{$path} = $map
… …
2058 } 2124 }
2059 2125
2060 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2062 2128
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2130 }
2065 2131
2066 $self->post_load; 2132 $self->post_load;
2067} 2133}
2068 2134
… …
2126 my ($path, $origin, $load) = @_; 2192 my ($path, $origin, $load) = @_;
2127 2193
2128 $path = normalise $path, $origin && $origin->{path}; 2194 $path = normalise $path, $origin && $origin->{path};
2129 2195
2130 if (my $map = $cf::MAP{$path}) { 2196 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2198 }
2133 2199
2134 $MAP_PREFETCH{$path} |= $load; 2200 $MAP_PREFETCH{$path} |= $load;
2135 2201
2136 $MAP_PREFETCHER ||= cf::async { 2202 $MAP_PREFETCHER ||= cf::async {
… …
2173 cf::async { 2239 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2240 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2241 $_->contr->save for $self->players;
2176 }; 2242 };
2177 2243
2244 cf::get_slot 0.02;
2245
2178 if ($uniq) { 2246 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2248 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2249 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2190 $self->save; 2258 $self->save;
2191 2259
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2261
2194 return if $self->players; 2262 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 2263 return if $self->in_memory != cf::MAP_ACTIVE;
2196 return if $self->{deny_save}; 2264 return if $self->{deny_save};
2197 2265
2198 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2199 2267
2200 $self->deactivate; 2268 $self->deactivate;
… …
2318 2386
2319sub unique_maps() { 2387sub unique_maps() {
2320 [ 2388 [
2321 map { 2389 map {
2322 utf8::decode $_; 2390 utf8::decode $_;
2323 /\.map$/ 2391 s/\.map$//; # TODO future compatibility hack
2392 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2393 ? ()
2324 ? normalise $_ 2394 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2395 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2396 ]
2328} 2397}
2329 2398
2330package cf;
2331
2332=back 2399=back
2333 2400
2334=head3 cf::object 2401=head3 cf::object
2335 2402
2336=cut 2403=cut
… …
2339 2406
2340=over 4 2407=over 4
2341 2408
2342=item $ob->inv_recursive 2409=item $ob->inv_recursive
2343 2410
2344Returns the inventory of the object _and_ their inventories, recursively. 2411Returns the inventory of the object I<and> their inventories, recursively,
2412but I<not> the object itself.
2345 2413
2346=cut 2414=cut
2347 2415
2348sub inv_recursive_; 2416sub inv_recursive_;
2349sub inv_recursive_ { 2417sub inv_recursive_ {
… …
2354 inv_recursive_ inv $_[0] 2422 inv_recursive_ inv $_[0]
2355} 2423}
2356 2424
2357=item $ref = $ob->ref 2425=item $ref = $ob->ref
2358 2426
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2427Creates and returns a persistent reference to an object that can be stored as a string.
2360 2428
2361=item $ob = cf::object::deref ($refstring) 2429=item $ob = cf::object::deref ($refstring)
2362 2430
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2431returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2432even if the object actually exists. May block.
… …
2396can be C<undef>. Does the right thing when the player is currently in a 2464can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2465dialogue with the given NPC character.
2398 2466
2399=cut 2467=cut
2400 2468
2469our $SAY_CHANNEL = {
2470 id => "say",
2471 title => "Map",
2472 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2474};
2475
2476our $CHAT_CHANNEL = {
2477 id => "chat",
2478 title => "Chat",
2479 reply => "chat ",
2480 tooltip => "Player chat and shouts, global to the server.",
2481};
2482
2401# rough implementation of a future "reply" method that works 2483# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2484# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2485#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2486sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2487 my ($self, $npc, $msg, $flags) = @_;
… …
2416 my $dialog = $pl->{npc_dialog}; 2498 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2499 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2500
2419 } else { 2501 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2502 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2503 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2504 }
2423 } 2505 }
2424} 2506}
2425 2507
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2508=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2621} 2703}
2622 2704
2623sub prepare_random_map { 2705sub prepare_random_map {
2624 my ($exit) = @_; 2706 my ($exit) = @_;
2625 2707
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2708 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2709 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2710 # that depends on the exit object
2631 2711
2632 my $rmp = parse_random_map_params $exit->msg; 2712 my $rmp = parse_random_map_params $exit->msg;
… …
2634 if ($exit->map) { 2714 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2715 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2716 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2717 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2718 $rmp->{origin_y} = $exit->y;
2719
2720 $exit->map->touch;
2639 } 2721 }
2640 2722
2641 $rmp->{random_seed} ||= $exit->random_seed; 2723 $rmp->{random_seed} ||= $exit->random_seed;
2642 2724
2643 my $data = cf::to_json $rmp; 2725 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2726 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2727 my $meta = "$RANDOMDIR/$md5.meta";
2646 2728
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2729 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2730 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2731 undef $fh;
2650 aio_rename "$meta~", $meta; 2732 aio_rename "$meta~", $meta;
2651 2733
2734 my $slaying = "?random/$md5";
2735
2736 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2737 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2738 $exit->msg (undef);
2739 }
2654 } 2740 }
2655} 2741}
2656 2742
2657sub cf::object::player::enter_exit { 2743sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2744 my ($self, $exit) = @_;
2659 2745
2660 return unless $self->type == cf::PLAYER; 2746 return unless $self->type == cf::PLAYER;
2661 2747
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2748 $self->enter_link;
2674 2749
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2750 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2751 $Coro::current->{desc} = "enter_exit";
2681 2752
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2753 unless (eval {
2754 $self->deactivate_recursive; # just to be sure
2755
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2765 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp;
2767
2684 $self->goto ($slaying, $hp, $sp); 2768 $self->goto ($map, $x, $y);
2685 2769
2770 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED);
2773
2686 1; 2774 1
2687 }) { 2775 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2776 $self->message ("Something went wrong deep within the crossfire server. "
2689 . "I'll try to bring you back to the map you were before. " 2777 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2778 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2779 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2771 id => "infobox", 2859 id => "infobox",
2772 title => "Map Info", 2860 title => "Map Info",
2773 reply => undef, 2861 reply => undef,
2774 tooltip => "Information related to the maps", 2862 tooltip => "Information related to the maps",
2775 }, 2863 },
2864 "c/party" => {
2865 id => "party",
2866 title => "Party",
2867 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party",
2869 },
2776); 2870);
2777 2871
2778sub cf::client::send_msg { 2872sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2873 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2874
… …
3017 3111
3018The following functions and methods are available within a safe environment: 3112The following functions and methods are available within a safe environment:
3019 3113
3020 cf::object 3114 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3115 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3116 insert remove name archname title slaying race decrease split
3023 3117
3024 cf::object::player 3118 cf::object::player
3025 player 3119 player
3026 3120
3027 cf::player 3121 cf::player
… …
3032 3126
3033=cut 3127=cut
3034 3128
3035for ( 3129for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3131 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3132 decrease split destroy)],
3039 ["cf::object::player" => qw(player)], 3133 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3134 ["cf::player" => qw(peaceful)],
3041 ["cf::map" => qw(trigger)], 3135 ["cf::map" => qw(trigger)],
3042) { 3136) {
3043 no strict 'refs'; 3137 no strict 'refs';
… …
3148 { 3242 {
3149 my $faces = $facedata->{faceinfo}; 3243 my $faces = $facedata->{faceinfo};
3150 3244
3151 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3246 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247
3153 cf::face::set_visibility $idx, $info->{visibility}; 3248 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3249 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3157 3252
3158 cf::cede_to_tick; 3253 cf::cede_to_tick;
3159 } 3254 }
3160 3255
3161 while (my ($face, $info) = each %$faces) { 3256 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3257 next unless $info->{smooth};
3258
3163 my $idx = cf::face::find $face 3259 my $idx = cf::face::find $face
3164 or next; 3260 or next;
3261
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3262 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3263 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3265 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3266 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3187 { 3284 {
3188 # TODO: for gcfclient pleasure, we should give resources 3285 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index. 3286 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3287 my $res = $facedata->{resource};
3191 3288
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3289 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3291 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data; 3292 my $data;
3197 3293
3198 if ($info->{type} & 1) { 3294 if ($info->{type} & 1) {
3199 # prepend meta info 3295 # prepend meta info
3200 3296
3201 my $meta = $enc->encode ({ 3297 my $meta = $enc->encode ({
3202 name => $name, 3298 name => $name,
3203 %{ $info->{meta} || {} }, 3299 %{ $info->{meta} || {} },
3204 }); 3300 });
3205 3301
3206 $data = pack "(w/a*)*", $meta, $info->{data}; 3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type};
3207 } else { 3309 } else {
3208 $data = $info->{data}; 3310 $RESOURCE{$name} = $info;
3209 } 3311 }
3210 3312
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3313 cf::cede_to_tick;
3215 } 3314 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3315 }
3316
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3318
3236 1 3319 1
3237} 3320}
3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
3238 3341
3239register_exticmd fx_want => sub { 3342register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3343 my ($ns, $want) = @_;
3241 3344
3242 while (my ($k, $v) = each %$want) { 3345 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3346 $ns->fx_want ($k, $v);
3244 } 3347 }
3245}; 3348};
3349
3350sub load_resource_file($) {
3351 my $guard = lock_acquire "load_resource_file";
3352
3353 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100;
3355 cf::arch::commit_load;
3356
3357 $status
3358}
3246 3359
3247sub reload_regions { 3360sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3361 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3362 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3363 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3264} 3377}
3265 3378
3266sub reload_archetypes { 3379sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3380 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3381 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3382}
3275 3383
3276sub reload_treasures { 3384sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3385 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3386 or die "unable to load treasurelists\n";
3279} 3387}
3280 3388
3281sub reload_resources { 3389sub reload_resources {
3282 warn "reloading resource files...\n"; 3390 warn "reloading resource files...\n";
3283 3391
3392 reload_facedata;
3393 reload_archetypes;
3284 reload_regions; 3394 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3395 reload_treasures;
3289 3396
3290 warn "finished reloading resource files\n"; 3397 warn "finished reloading resource files\n";
3291} 3398}
3292 3399
3293sub init { 3400sub init {
3401 my $guard = freeze_mainloop;
3402
3294 reload_resources; 3403 reload_resources;
3295} 3404}
3296 3405
3297sub reload_config { 3406sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3408 or return;
3300 3409
3301 local $/; 3410 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3303 3412
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3414
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3433 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3326 }; 3435 };
3327 3436
3437 {
3438 my $guard = freeze_mainloop;
3328 reload_config; 3439 reload_config;
3329 db_init; 3440 db_init;
3330 load_extensions; 3441 load_extensions;
3331 3442
3332 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3333 EV::loop; 3446 EV::loop;
3334} 3447}
3335 3448
3336############################################################################# 3449#############################################################################
3337# initialisation and cleanup 3450# initialisation and cleanup
… …
3344 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3345 }; 3458 };
3346 } 3459 }
3347} 3460}
3348 3461
3349sub write_runtime { 3462sub write_runtime_sync {
3350 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3351 3464
3352 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3353 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3354 3467
… …
3380 and return; 3493 and return;
3381 3494
3382 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3383 3496
3384 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3385} 3541}
3386 3542
3387sub emergency_save() { 3543sub emergency_save() {
3388 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3389 3545
… …
3411 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3412 3568
3413 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3414 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3415 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3416 }; 3576 };
3417 3577
3418 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3419} 3579}
3420 3580
… …
3435 warn "reloading..."; 3595 warn "reloading...";
3436 3596
3437 warn "entering sync_job"; 3597 warn "entering sync_job";
3438 3598
3439 cf::sync_job { 3599 cf::sync_job {
3440 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3441 cf::emergency_save; 3601 cf::emergency_save;
3442 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3443 3603
3444 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3445 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3446 3606
3447 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
… …
3534 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3535 3695
3536 1 3696 1
3537 } or do { 3697 } or do {
3538 warn $@; 3698 warn $@;
3539 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3540 exit 1;
3541 }; 3700 };
3542 3701
3543 warn "reloaded"; 3702 warn "reloaded";
3544}; 3703};
3545 3704
… …
3548sub reload_perl() { 3707sub reload_perl() {
3549 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3550 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3551 3710
3552 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3712 do_reload_perl;
3553 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3554 do_reload_perl;
3555 }; 3714 };
3556} 3715}
3557 3716
3558register_command "reload" => sub { 3717register_command "reload" => sub {
3559 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
… …
3573 3732
3574our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3575our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3576 3735
3577sub wait_for_tick { 3736sub wait_for_tick {
3578 return unless $TICK_WATCHER->is_active;
3579 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3580 3738
3581 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3582 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3583 $signal->wait; 3741 $signal->wait;
3584} 3742}
3585 3743
3586sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3587 return unless $TICK_WATCHER->is_active;
3588 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3589 3746
3590 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3591 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3592 $signal->wait; 3749 $signal->wait;
3593} 3750}
3594 3751
3595$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3752sub tick {
3596 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3597 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3598 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3599 return; 3756 return;
3600 } 3757 }
3601 3758
3602 $NOW = $tick_start = EV::now;
3603
3604 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3605 3760
3606 $RUNTIME += $TICK;
3607 $NEXT_TICK += $TICK;
3608
3609 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3610 $NEXT_RUNTIME_WRITE = $NOW + 10; 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3611 Coro::async_pool { 3763 Coro::async_pool {
3612 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3613 write_runtime 3765 write_runtime_sync
3614 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3615 }; 3767 };
3616 } 3768 }
3617 3769
3618 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3620 } 3772 }
3621 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3622 $sig->send; 3774 $sig->send;
3623 } 3775 }
3624 3776
3625 $LOAD = ($NOW - $tick_start) / $TICK; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3626 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3627 3779
3628 _post_tick; 3780 if (0) {
3629}; 3781 if ($NEXT_TICK) {
3630$TICK_WATCHER->priority (EV::MAXPRI); 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3786 }
3787}
3631 3788
3632{ 3789{
3790 # configure BDB
3791
3633 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3634 BDB::max_poll_time $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3635 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3794 $AnyEvent::BDB::WATCHER->priority (1);
3636
3637 BDB::set_sync_prepare {
3638 my $status;
3639 my $current = $Coro::current;
3640 (
3641 sub {
3642 $status = $!;
3643 $current->ready; undef $current;
3644 },
3645 sub {
3646 Coro::schedule while defined $current;
3647 $! = $status;
3648 },
3649 )
3650 };
3651 3795
3652 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3653 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3654 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3655 | BDB::LOG_AUTOREMOVE, 1); 3799 | BDB::LOG_AUTOREMOVE, 1);
… …
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 }; 3827 };
3684} 3828}
3685 3829
3686{ 3830{
3831 # configure IO::AIO
3832
3687 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3688
3689 undef $Coro::AIO::WATCHER;
3690 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3691 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3835 #undef $AnyEvent::AIO::WATCHER;
3692} 3836}
3693 3837
3694my $_log_backtrace; 3838my $_log_backtrace;
3695 3839
3696sub _log_backtrace { 3840sub _log_backtrace {
… …
3734# load additional modules 3878# load additional modules
3735use cf::pod; 3879use cf::pod;
3736 3880
3737END { cf::emergency_save } 3881END { cf::emergency_save }
3738 3882
3883evthread_start IO::AIO::poll_fileno;
3884
37391 38851
3740 3886

Diff Legend

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