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

Diff Legend

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