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

Diff Legend

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