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

Diff Legend

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