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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.435 by root, Thu May 29 03:33:20 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
… …
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.1 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::EV; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS 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 $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';
… …
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
… …
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
… …
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...])
… …
2621} 2701}
2622 2702
2623sub prepare_random_map { 2703sub prepare_random_map {
2624 my ($exit) = @_; 2704 my ($exit) = @_;
2625 2705
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2708 # that depends on the exit object
2631 2709
2632 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
… …
2634 if ($exit->map) { 2712 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2639 } 2719 }
2640 2720
2641 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2642 2722
2643 my $data = cf::encode_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2646 2726
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2729 undef $fh;
2650 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2651 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2654 } 2738 }
2655} 2739}
2656 2740
2657sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2659 2743
2660 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2661 2745
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; 2746 $self->enter_link;
2674 2747
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 { 2748 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2749 $Coro::current->{desc} = "enter_exit";
2681 2750
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2684 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2685 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2686 1; 2772 1
2687 }) { 2773 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2689 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2771 id => "infobox", 2857 id => "infobox",
2772 title => "Map Info", 2858 title => "Map Info",
2773 reply => undef, 2859 reply => undef,
2774 tooltip => "Information related to the maps", 2860 tooltip => "Information related to the maps",
2775 }, 2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2776); 2868);
2777 2869
2778sub cf::client::send_msg { 2870sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2872
… …
3017 3109
3018The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
3019 3111
3020 cf::object 3112 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3113 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
3023 3115
3024 cf::object::player 3116 cf::object::player
3025 player 3117 player
3026 3118
3027 cf::player 3119 cf::player
… …
3032 3124
3033=cut 3125=cut
3034 3126
3035for ( 3127for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3130 decrease split destroy)],
3039 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
3041 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
3042) { 3134) {
3043 no strict 'refs'; 3135 no strict 'refs';
… …
3148 { 3240 {
3149 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
3150 3242
3151 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
3153 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3248 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}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3157 3250
3158 cf::cede_to_tick; 3251 cf::cede_to_tick;
3159 } 3252 }
3160 3253
3161 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
3163 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
3164 or next; 3258 or next;
3259
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3263 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3187 { 3282 {
3188 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
3191 3286
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data; 3290 my $data;
3197 3291
3198 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
3199 # prepend meta info 3293 # prepend meta info
3200 3294
3201 my $meta = $enc->encode ({ 3295 my $meta = $enc->encode ({
3202 name => $name, 3296 name => $name,
3203 %{ $info->{meta} || {} }, 3297 %{ $info->{meta} || {} },
3204 }); 3298 });
3205 3299
3206 $data = pack "(w/a*)*", $meta, $info->{data}; 3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type};
3207 } else { 3307 } else {
3208 $data = $info->{data}; 3308 $RESOURCE{$name} = $info;
3209 } 3309 }
3210 3310
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; 3311 cf::cede_to_tick;
3215 } 3312 }
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 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3316
3236 1 3317 1
3237} 3318}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3238 3339
3239register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
3241 3342
3242 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3244 } 3345 }
3245}; 3346};
3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3246 3357
3247sub reload_regions { 3358sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3359 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3360 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3264} 3375}
3265 3376
3266sub reload_archetypes { 3377sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3379 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} 3380}
3275 3381
3276sub reload_treasures { 3382sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3279} 3385}
3280 3386
3281sub reload_resources { 3387sub reload_resources {
3282 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3283 3389
3390 reload_facedata;
3391 reload_archetypes;
3284 reload_regions; 3392 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3393 reload_treasures;
3289 3394
3290 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3291} 3396}
3292 3397
3293sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3294 reload_resources; 3403 reload_resources;
3295} 3404}
3296 3405
3297sub reload_config { 3406sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3408 or return;
3300 3409
3301 local $/; 3410 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3303 3412
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3414
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3433 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3326 }; 3435 };
3327 3436
3437 {
3438 my $guard = freeze_mainloop;
3328 reload_config; 3439 reload_config;
3329 db_init; 3440 db_init;
3330 load_extensions; 3441 load_extensions;
3331 3442
3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3334 EV::loop; 3446 EV::loop;
3335} 3447}
3336 3448
3337############################################################################# 3449#############################################################################
3338# initialisation and cleanup 3450# initialisation and cleanup
… …
3345 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3346 }; 3458 };
3347 } 3459 }
3348} 3460}
3349 3461
3350sub write_runtime { 3462sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3352 3464
3353 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3355 3467
… …
3381 and return; 3493 and return;
3382 3494
3383 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3384 3496
3385 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3386} 3541}
3387 3542
3388sub emergency_save() { 3543sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3390 3545
… …
3412 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3413 3568
3414 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3417 }; 3576 };
3418 3577
3419 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3420} 3579}
3421 3580
… …
3436 warn "reloading..."; 3595 warn "reloading...";
3437 3596
3438 warn "entering sync_job"; 3597 warn "entering sync_job";
3439 3598
3440 cf::sync_job { 3599 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3601 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3444 3603
3445 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3606
3448 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
… …
3535 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3536 3695
3537 1 3696 1
3538 } or do { 3697 } or do {
3539 warn $@; 3698 warn $@;
3540 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3700 };
3543 3701
3544 warn "reloaded"; 3702 warn "reloaded";
3545}; 3703};
3546 3704
… …
3549sub reload_perl() { 3707sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3552 3710
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3712 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3555 do_reload_perl;
3556 }; 3714 };
3557} 3715}
3558 3716
3559register_command "reload" => sub { 3717register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
… …
3574 3732
3575our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3577 3735
3578sub wait_for_tick { 3736sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3581 3738
3582 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3741 $signal->wait;
3585} 3742}
3586 3743
3587sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3590 3746
3591 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3749 $signal->wait;
3594} 3750}
3595 3751
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3752sub tick {
3597 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3600 return; 3756 return;
3601 } 3757 }
3602 3758
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3606 3760
3607 $RUNTIME += $TICK;
3608 $NEXT_TICK += $TICK;
3609
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 3763 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 3765 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3616 }; 3767 };
3617 } 3768 }
3618 3769
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3621 } 3772 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 3774 $sig->send;
3624 } 3775 }
3625 3776
3626 $LOAD = ($NOW - $tick_start) / $TICK; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 3779
3629 _post_tick; 3780 if (0) {
3630}; 3781 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3786 }
3787}
3632 3788
3633{ 3789{
3790 # configure BDB
3791
3634 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3635 BDB::max_poll_time $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3794 $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 3795
3653 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1); 3799 | BDB::LOG_AUTOREMOVE, 1);
… …
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 3827 };
3685} 3828}
3686 3829
3687{ 3830{
3831 # configure IO::AIO
3832
3688 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3835 undef $AnyEvent::AIO::WATCHER;
3693} 3836}
3694 3837
3695my $_log_backtrace; 3838my $_log_backtrace;
3696 3839
3697sub _log_backtrace { 3840sub _log_backtrace {

Diff Legend

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