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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.434 by root, Thu May 29 03:27:37 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.32 (); 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;
23use Coro::BDB; 45use Coro::BDB;
24use Coro::Storable; 46use Coro::Storable;
25use Coro::Util (); 47use Coro::Util ();
26 48
… …
28use BDB (); 50use BDB ();
29use Data::Dumper; 51use Data::Dumper;
30use Digest::MD5; 52use Digest::MD5;
31use Fcntl; 53use Fcntl;
32use YAML (); 54use YAML ();
33use IO::AIO 2.51 (); 55use IO::AIO ();
34use Time::HiRes; 56use Time::HiRes;
35use Compress::LZF; 57use Compress::LZF;
36use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
61
62IO::AIO::max_poll_reqs 1;#d#
37 63
38# configure various modules to our taste 64# configure various modules to our taste
39# 65#
40$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
69our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 97our %RESOURCE;
72 98
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 101our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
79 103
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 107our $DB_ENV;
85 108
… …
96# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 121
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
102 126
103binmode STDOUT; 127binmode STDOUT;
104binmode STDERR; 128binmode STDERR;
105 129
106# read virtual server time, if available 130# read virtual server time, if available
… …
339 363
340 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
341} 365}
342 366
343sub freeze_mainloop { 367sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
345 369
346 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 371}
352 372
353=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
354 374
355Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
410 } 430 }
411 } 431 }
412}; 432};
413 433
414sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
415 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
416 438
417 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
419 441
… …
456 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
458 480
459 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
460 482
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
464 484
465 my $busy = 1; 485 my $busy = 1;
466 my @res; 486 my @res;
467 487
… …
478 } else { 498 } else {
479 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
480 } 500 }
481 } 501 }
482 502
483 $time = EV::time - $time; 503 my $time = EV::time - $time;
484 504
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
489 506
490 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
491 } else { 508 } else {
492 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
493 510
… …
535 reset_signals; 552 reset_signals;
536 &$cb 553 &$cb
537 }, @args; 554 }, @args;
538 555
539 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
540} 584}
541 585
542=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
543 587
544Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
1100 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1145 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1146 $decname, length $$rdata, scalar @$objs;
1103 1147
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1149 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1151 aio_fsync $fh if $cf::USE_FSYNC;
1108 close $fh; 1152 aio_close $fh;
1109 1153
1110 if (@$objs) { 1154 if (@$objs) {
1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1112 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1158 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
1116 close $fh; 1160 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1161 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1162 }
1119 } else { 1163 } else {
1120 aio_unlink "$filename.pst"; 1164 aio_unlink "$filename.pst";
1121 } 1165 }
… …
1316 my $msg = $@ ? "$v->{path}: $@\n" 1360 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n"; 1361 : "$v->{base}: extension inactive.\n";
1318 1362
1319 if (exists $v->{meta}{mandatory}) { 1363 if (exists $v->{meta}{mandatory}) {
1320 warn $msg; 1364 warn $msg;
1321 warn "mandatory extension failed to load, exiting.\n"; 1365 cf::cleanup "mandatory extension failed to load, exiting.";
1322 exit 1;
1323 } 1366 }
1324 1367
1325 warn $msg; 1368 warn $msg;
1326 } 1369 }
1327 1370
… …
1416 my $f = new_from_file cf::object::thawer path $login 1459 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1460 or return;
1418 1461
1419 my $pl = cf::player::load_pl $f 1462 my $pl = cf::player::load_pl $f
1420 or return; 1463 or return;
1464
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1465 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1466 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1467 $cf::PLAYER{$login} = $pl
1424 } 1468 }
1425 } 1469 }
… …
1435 1479
1436 return if $pl->{deny_save}; 1480 return if $pl->{deny_save};
1437 1481
1438 aio_mkdir playerdir $pl, 0770; 1482 aio_mkdir playerdir $pl, 0770;
1439 $pl->{last_save} = $cf::RUNTIME; 1483 $pl->{last_save} = $cf::RUNTIME;
1484
1485 cf::get_slot 0.01;
1440 1486
1441 $pl->save_pl ($path); 1487 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1488 cf::cede_to_tick;
1443} 1489}
1444 1490
… …
1480 $pl->{deny_save} = 1; 1526 $pl->{deny_save} = 1;
1481 $pl->password ("*"); # this should lock out the player until we nuked the dir 1527 $pl->password ("*"); # this should lock out the player until we nuked the dir
1482 1528
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1484 $pl->deactivate; 1530 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1533 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1486 $pl->ns->destroy if $pl->ns; 1534 $pl->ns->destroy if $pl->ns;
1487 1535
1488 my $path = playerdir $pl; 1536 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1537 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1528 1576
1529 for my $login (@$dirs) { 1577 for my $login (@$dirs) {
1530 my $path = path $login; 1578 my $path = path $login;
1531 1579
1532 # a .pst is a dead give-away for a valid player 1580 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1581 # if no pst file found, open and chekc for blocked users
1582 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1583 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1584 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1585 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1586 }
1538 1587
… …
1737our $MAX_RESET = 3600; 1786our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1787our $DEFAULT_RESET = 3000;
1739 1788
1740sub generate_random_map { 1789sub generate_random_map {
1741 my ($self, $rmp) = @_; 1790 my ($self, $rmp) = @_;
1791
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793
1742 # mit "rum" bekleckern, nicht 1794 # mit "rum" bekleckern, nicht
1743 $self->_create_random_map ( 1795 $self->_create_random_map (
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1868 1920
1869# the temporary/swap location 1921# the temporary/swap location
1870sub save_path { 1922sub save_path {
1871 my ($self) = @_; 1923 my ($self) = @_;
1872 1924
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1925 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 1926 "$TMPDIR/$path.map"
1875} 1927}
1876 1928
1877# the unique path, undef == no special unique path 1929# the unique path, undef == no special unique path
1878sub uniq_path { 1930sub uniq_path {
1879 my ($self) = @_; 1931 my ($self) = @_;
1880 1932
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 1934 "$UNIQUEDIR/$path"
1883} 1935}
1884 1936
1885# and all this just because we cannot iterate over 1937# and all this just because we cannot iterate over
1886# all maps in C++... 1938# all maps in C++...
… …
1984 2036
1985 cf::lock_wait "map_data:$path";#d#remove 2037 cf::lock_wait "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 2038 cf::lock_wait "map_find:$path";
1987 2039
1988 $cf::MAP{$path} || do { 2040 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
1991 2043
1992 my $map = new_from_path cf::map $path 2044 my $map = new_from_path cf::map $path
1993 or return; 2045 or return;
1994 2046
1995 $map->{last_save} = $cf::RUNTIME; 2047 $map->{last_save} = $cf::RUNTIME;
… …
1998 or return; 2050 or return;
1999 2051
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2052 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 2053 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 2054 #$cf::WAIT_FOR_TICK->wait;
2055 undef $guard2;
2003 undef $guard1; 2056 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 2057 $map->reset;
2006 return find $path; 2058 return find $path;
2007 } 2059 }
2008 2060
2009 $cf::MAP{$path} = $map 2061 $cf::MAP{$path} = $map
… …
2072 } 2124 }
2073 2125
2074 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2076 2128
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2130 }
2079 2131
2080 $self->post_load; 2132 $self->post_load;
2081} 2133}
2082 2134
… …
2140 my ($path, $origin, $load) = @_; 2192 my ($path, $origin, $load) = @_;
2141 2193
2142 $path = normalise $path, $origin && $origin->{path}; 2194 $path = normalise $path, $origin && $origin->{path};
2143 2195
2144 if (my $map = $cf::MAP{$path}) { 2196 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2198 }
2147 2199
2148 $MAP_PREFETCH{$path} |= $load; 2200 $MAP_PREFETCH{$path} |= $load;
2149 2201
2150 $MAP_PREFETCHER ||= cf::async { 2202 $MAP_PREFETCHER ||= cf::async {
… …
2187 cf::async { 2239 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2240 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2241 $_->contr->save for $self->players;
2190 }; 2242 };
2191 2243
2244 cf::get_slot 0.02;
2245
2192 if ($uniq) { 2246 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2248 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2249 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2204 $self->save; 2258 $self->save;
2205 2259
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2261
2208 return if $self->players; 2262 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY; 2263 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2264 return if $self->{deny_save};
2211 2265
2212 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2213 2267
2214 $self->deactivate; 2268 $self->deactivate;
… …
2332 2386
2333sub unique_maps() { 2387sub unique_maps() {
2334 [ 2388 [
2335 map { 2389 map {
2336 utf8::decode $_; 2390 utf8::decode $_;
2337 /\.map$/ 2391 s/\.map$//; # TODO future compatibility hack
2392 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2393 ? ()
2338 ? normalise $_ 2394 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2395 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2396 ]
2342} 2397}
2343 2398
2344package cf;
2345
2346=back 2399=back
2347 2400
2348=head3 cf::object 2401=head3 cf::object
2349 2402
2350=cut 2403=cut
… …
2353 2406
2354=over 4 2407=over 4
2355 2408
2356=item $ob->inv_recursive 2409=item $ob->inv_recursive
2357 2410
2358Returns the inventory of the object _and_ their inventories, recursively. 2411Returns the inventory of the object I<and> their inventories, recursively,
2412but I<not> the object itself.
2359 2413
2360=cut 2414=cut
2361 2415
2362sub inv_recursive_; 2416sub inv_recursive_;
2363sub inv_recursive_ { 2417sub inv_recursive_ {
… …
2368 inv_recursive_ inv $_[0] 2422 inv_recursive_ inv $_[0]
2369} 2423}
2370 2424
2371=item $ref = $ob->ref 2425=item $ref = $ob->ref
2372 2426
2373creates and returns a persistent reference to an objetc that can be stored as a string. 2427Creates and returns a persistent reference to an object that can be stored as a string.
2374 2428
2375=item $ob = cf::object::deref ($refstring) 2429=item $ob = cf::object::deref ($refstring)
2376 2430
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2431returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block. 2432even if the object actually exists. May block.
… …
2410can be C<undef>. Does the right thing when the player is currently in a 2464can be C<undef>. Does the right thing when the player is currently in a
2411dialogue with the given NPC character. 2465dialogue with the given NPC character.
2412 2466
2413=cut 2467=cut
2414 2468
2469our $SAY_CHANNEL = {
2470 id => "say",
2471 title => "Map",
2472 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2474};
2475
2476our $CHAT_CHANNEL = {
2477 id => "chat",
2478 title => "Chat",
2479 reply => "chat ",
2480 tooltip => "Player chat and shouts, global to the server.",
2481};
2482
2415# rough implementation of a future "reply" method that works 2483# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2484# with dialog boxes.
2417#TODO: the first argument must go, split into a $npc->reply_to ( method 2485#TODO: the first argument must go, split into a $npc->reply_to ( method
2418sub cf::object::player::reply($$$;$) { 2486sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2487 my ($self, $npc, $msg, $flags) = @_;
… …
2430 my $dialog = $pl->{npc_dialog}; 2498 my $dialog = $pl->{npc_dialog};
2431 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2499 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2432 2500
2433 } else { 2501 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2502 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2503 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2504 }
2437 } 2505 }
2438} 2506}
2439 2507
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2508=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2635} 2703}
2636 2704
2637sub prepare_random_map { 2705sub prepare_random_map {
2638 my ($exit) = @_; 2706 my ($exit) = @_;
2639 2707
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2708 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2709 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2710 # that depends on the exit object
2645 2711
2646 my $rmp = parse_random_map_params $exit->msg; 2712 my $rmp = parse_random_map_params $exit->msg;
… …
2648 if ($exit->map) { 2714 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2715 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2716 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2717 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2718 $rmp->{origin_y} = $exit->y;
2719
2720 $exit->map->touch;
2653 } 2721 }
2654 2722
2655 $rmp->{random_seed} ||= $exit->random_seed; 2723 $rmp->{random_seed} ||= $exit->random_seed;
2656 2724
2657 my $data = cf::encode_json $rmp; 2725 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2726 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2727 my $meta = "$RANDOMDIR/$md5.meta";
2660 2728
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2729 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2730 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 2731 undef $fh;
2664 aio_rename "$meta~", $meta; 2732 aio_rename "$meta~", $meta;
2665 2733
2734 my $slaying = "?random/$md5";
2735
2736 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 2737 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 2738 $exit->msg (undef);
2739 }
2668 } 2740 }
2669} 2741}
2670 2742
2671sub cf::object::player::enter_exit { 2743sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 2744 my ($self, $exit) = @_;
2673 2745
2674 return unless $self->type == cf::PLAYER; 2746 return unless $self->type == cf::PLAYER;
2675 2747
2676 if ($exit->slaying eq "/!") {
2677 #TODO: this should de-fi-ni-te-ly not be a sync-job
2678 # the problem is that $exit might not survive long enough
2679 # so it needs to be done right now, right here
2680 cf::sync_job { prepare_random_map $exit };
2681 }
2682
2683 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2684 my $hp = $exit->stats->hp;
2685 my $sp = $exit->stats->sp;
2686
2687 $self->enter_link; 2748 $self->enter_link;
2688 2749
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2693 (async { 2750 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2751 $Coro::current->{desc} = "enter_exit";
2695 2752
2696 $self->deactivate_recursive; # just to be sure
2697 unless (eval { 2753 unless (eval {
2754 $self->deactivate_recursive; # just to be sure
2755
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2765 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp;
2767
2698 $self->goto ($slaying, $hp, $sp); 2768 $self->goto ($map, $x, $y);
2699 2769
2770 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED);
2773
2700 1; 2774 1
2701 }) { 2775 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 2776 $self->message ("Something went wrong deep within the crossfire server. "
2703 . "I'll try to bring you back to the map you were before. " 2777 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2778 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2779 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2785 id => "infobox", 2859 id => "infobox",
2786 title => "Map Info", 2860 title => "Map Info",
2787 reply => undef, 2861 reply => undef,
2788 tooltip => "Information related to the maps", 2862 tooltip => "Information related to the maps",
2789 }, 2863 },
2864 "c/party" => {
2865 id => "party",
2866 title => "Party",
2867 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party",
2869 },
2790); 2870);
2791 2871
2792sub cf::client::send_msg { 2872sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 2873 my ($self, $channel, $msg, $color, @extra) = @_;
2794 2874
… …
3031 3111
3032The following functions and methods are available within a safe environment: 3112The following functions and methods are available within a safe environment:
3033 3113
3034 cf::object 3114 cf::object
3035 contr pay_amount pay_player map x y force_find force_add destroy 3115 contr pay_amount pay_player map x y force_find force_add destroy
3036 insert remove name archname title slaying race decrease_ob_nr 3116 insert remove name archname title slaying race decrease split
3037 3117
3038 cf::object::player 3118 cf::object::player
3039 player 3119 player
3040 3120
3041 cf::player 3121 cf::player
… …
3046 3126
3047=cut 3127=cut
3048 3128
3049for ( 3129for (
3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race 3131 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3132 decrease split destroy)],
3053 ["cf::object::player" => qw(player)], 3133 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3134 ["cf::player" => qw(peaceful)],
3055 ["cf::map" => qw(trigger)], 3135 ["cf::map" => qw(trigger)],
3056) { 3136) {
3057 no strict 'refs'; 3137 no strict 'refs';
… …
3265 while (my ($k, $v) = each %$want) { 3345 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3346 $ns->fx_want ($k, $v);
3267 } 3347 }
3268}; 3348};
3269 3349
3350sub load_resource_file($) {
3351 my $guard = lock_acquire "load_resource_file";
3352
3353 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100;
3355 cf::arch::commit_load;
3356
3357 $status
3358}
3359
3270sub reload_regions { 3360sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework 3361 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?) 3362 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3363 %ext::player_env::MUSIC_FACE_CACHE = ();
3274 3364
… …
3287} 3377}
3288 3378
3289sub reload_archetypes { 3379sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3380 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3381 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
3297} 3382}
3298 3383
3299sub reload_treasures { 3384sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3385 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3386 or die "unable to load treasurelists\n";
3302} 3387}
3303 3388
3304sub reload_resources { 3389sub reload_resources {
3305 warn "reloading resource files...\n"; 3390 warn "reloading resource files...\n";
3306 3391
3392 reload_facedata;
3393 reload_archetypes;
3307 reload_regions; 3394 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3395 reload_treasures;
3312 3396
3313 warn "finished reloading resource files\n"; 3397 warn "finished reloading resource files\n";
3314} 3398}
3315 3399
3316sub init { 3400sub init {
3401 my $guard = freeze_mainloop;
3402
3317 reload_resources; 3403 reload_resources;
3318} 3404}
3319 3405
3320sub reload_config { 3406sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3433 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3349 }; 3435 };
3350 3436
3437 {
3438 my $guard = freeze_mainloop;
3351 reload_config; 3439 reload_config;
3352 db_init; 3440 db_init;
3353 load_extensions; 3441 load_extensions;
3354 3442
3355 $TICK_WATCHER->start;
3356 $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
3357 EV::loop; 3446 EV::loop;
3358} 3447}
3359 3448
3360############################################################################# 3449#############################################################################
3361# initialisation and cleanup 3450# initialisation and cleanup
… …
3368 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3369 }; 3458 };
3370 } 3459 }
3371} 3460}
3372 3461
3373sub write_runtime { 3462sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3375 3464
3376 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3378 3467
… …
3404 and return; 3493 and return;
3405 3494
3406 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3407 3496
3408 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 };
3409} 3541}
3410 3542
3411sub emergency_save() { 3543sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3413 3545
… …
3435 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3436 3568
3437 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3439 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";
3440 }; 3576 };
3441 3577
3442 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3443} 3579}
3444 3580
… …
3459 warn "reloading..."; 3595 warn "reloading...";
3460 3596
3461 warn "entering sync_job"; 3597 warn "entering sync_job";
3462 3598
3463 cf::sync_job { 3599 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3465 cf::emergency_save; 3601 cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3467 3603
3468 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3470 3606
3471 # 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
… …
3558 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3559 3695
3560 1 3696 1
3561 } or do { 3697 } or do {
3562 warn $@; 3698 warn $@;
3563 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3564 exit 1;
3565 }; 3700 };
3566 3701
3567 warn "reloaded"; 3702 warn "reloaded";
3568}; 3703};
3569 3704
… …
3597 3732
3598our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3600 3735
3601sub wait_for_tick { 3736sub wait_for_tick {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3604 3738
3605 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 3741 $signal->wait;
3608} 3742}
3609 3743
3610sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3613 3746
3614 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 3749 $signal->wait;
3617} 3750}
3618 3751
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3752sub tick {
3620 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3621 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"
3622 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3623 return; 3756 return;
3624 } 3757 }
3625 3758
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 3760
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 3763 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 3765 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3639 }; 3767 };
3640 } 3768 }
3641 3769
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3644 } 3772 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 3774 $sig->send;
3647 } 3775 }
3648 3776
3649 $LOAD = ($NOW - $tick_start) / $TICK; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 3779
3652 _post_tick; 3780 if (0) {
3653}; 3781 if ($NEXT_TICK) {
3654$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}
3655 3788
3656{ 3789{
3657 # configure BDB 3790 # configure BDB
3658 3791
3659 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3660 BDB::max_poll_reqs $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 3794 $AnyEvent::BDB::WATCHER->priority (1);
3662 3795
3663 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3665 $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
3666 | BDB::LOG_AUTOREMOVE, 1); 3799 | BDB::LOG_AUTOREMOVE, 1);
… …
3697{ 3830{
3698 # configure IO::AIO 3831 # configure IO::AIO
3699 3832
3700 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 3835 #undef $AnyEvent::AIO::WATCHER;
3703} 3836}
3704 3837
3705my $_log_backtrace; 3838my $_log_backtrace;
3706 3839
3707sub _log_backtrace { 3840sub _log_backtrace {
… …
3745# load additional modules 3878# load additional modules
3746use cf::pod; 3879use cf::pod;
3747 3880
3748END { cf::emergency_save } 3881END { cf::emergency_save }
3749 3882
3883evthread_start IO::AIO::poll_fileno;
3884
37501 38851
3751 3886

Diff Legend

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