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.411 by root, Fri Feb 1 15:54:07 2008 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
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;
37 61
38# configure various modules to our taste 62# configure various modules to our taste
39# 63#
40$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
41Coro::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
… …
69our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 95our %RESOURCE;
72 96
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $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 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 99our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
79 101
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 105our $DB_ENV;
85 106
… …
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 119
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
102 124
103binmode STDOUT; 125binmode STDOUT;
104binmode STDERR; 126binmode STDERR;
105 127
106# read virtual server time, if available 128# read virtual server time, if available
… …
339 361
340 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
341} 363}
342 364
343sub freeze_mainloop { 365sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
345 367
346 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 369}
352 370
353=item cf::periodic $interval, $cb 371=item cf::periodic $interval, $cb
354 372
355Like 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
… …
410 } 428 }
411 } 429 }
412}; 430};
413 431
414sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
415 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
416 436
417 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
419 439
… …
456 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
458 478
459 LOG llevError, Carp::longmess "sync job";#d# 479 LOG llevError, Carp::longmess "sync job";#d#
460 480
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
464 482
465 my $busy = 1; 483 my $busy = 1;
466 my @res; 484 my @res;
467 485
… …
478 } else { 496 } else {
479 EV::loop EV::LOOP_ONESHOT; 497 EV::loop EV::LOOP_ONESHOT;
480 } 498 }
481 } 499 }
482 500
483 $time = EV::time - $time; 501 my $time = EV::time - $time;
484 502
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 503 $TICK_START += $time; # do not account sync jobs to server load
489 504
490 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
491 } else { 506 } else {
492 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
493 508
… …
535 reset_signals; 550 reset_signals;
536 &$cb 551 &$cb
537 }, @args; 552 }, @args;
538 553
539 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
540} 582}
541 583
542=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
543 585
544Returns a single value from the environment database. 586Returns a single value from the environment database.
… …
1100 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1103 1145
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1108 close $fh; 1150 aio_close $fh;
1109 1151
1110 if (@$objs) { 1152 if (@$objs) {
1111 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) {
1112 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1116 close $fh; 1158 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1160 }
1119 } else { 1161 } else {
1120 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1121 } 1163 }
… …
1415 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1458 or return;
1417 1459
1418 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1419 or return; 1461 or return;
1462
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1423 } 1466 }
1424 } 1467 }
… …
1434 1477
1435 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1436 1479
1437 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1439 1484
1440 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1486 cf::cede_to_tick;
1442} 1487}
1443 1488
… …
1479 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1480 $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
1481 1526
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1483 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1485 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1486 1533
1487 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1527 1574
1528 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1529 my $path = path $login; 1576 my $path = path $login;
1530 1577
1531 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1584 }
1537 1585
… …
1736our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1738 1786
1739sub generate_random_map { 1787sub generate_random_map {
1740 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
1741 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1793 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1867 1918
1868# the temporary/swap location 1919# the temporary/swap location
1869sub save_path { 1920sub save_path {
1870 my ($self) = @_; 1921 my ($self) = @_;
1871 1922
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1874} 1925}
1875 1926
1876# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1877sub uniq_path { 1928sub uniq_path {
1878 my ($self) = @_; 1929 my ($self) = @_;
1879 1930
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1882} 1933}
1883 1934
1884# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1885# all maps in C++... 1936# all maps in C++...
… …
1983 2034
1984 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1986 2037
1987 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 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";
1990 2041
1991 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1992 or return; 2043 or return;
1993 2044
1994 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
1997 or return; 2048 or return;
1998 2049
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2002 undef $guard1; 2054 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2055 $map->reset;
2005 return find $path; 2056 return find $path;
2006 } 2057 }
2007 2058
2008 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2071 } 2122 }
2072 2123
2073 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2075 2126
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2128 }
2078 2129
2079 $self->post_load; 2130 $self->post_load;
2080} 2131}
2081 2132
… …
2139 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2140 2191
2141 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2142 2193
2143 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2196 }
2146 2197
2147 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2148 2199
2149 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
… …
2186 cf::async { 2237 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2189 }; 2240 };
2190 2241
2242 cf::get_slot 0.02;
2243
2191 if ($uniq) { 2244 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2247 } else {
2195 $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);
… …
2203 $self->save; 2256 $self->save;
2204 2257
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2259
2207 return if $self->players; 2260 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2209 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2210 2263
2211 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2212 2265
2213 $self->deactivate; 2266 $self->deactivate;
… …
2331 2384
2332sub unique_maps() { 2385sub unique_maps() {
2333 [ 2386 [
2334 map { 2387 map {
2335 utf8::decode $_; 2388 utf8::decode $_;
2336 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2337 ? normalise $_ 2392 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2394 ]
2341} 2395}
2342 2396
2343package cf;
2344
2345=back 2397=back
2346 2398
2347=head3 cf::object 2399=head3 cf::object
2348 2400
2349=cut 2401=cut
… …
2352 2404
2353=over 4 2405=over 4
2354 2406
2355=item $ob->inv_recursive 2407=item $ob->inv_recursive
2356 2408
2357Returns 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.
2358 2411
2359=cut 2412=cut
2360 2413
2361sub inv_recursive_; 2414sub inv_recursive_;
2362sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2367 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2368} 2421}
2369 2422
2370=item $ref = $ob->ref 2423=item $ref = $ob->ref
2371 2424
2372creates 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.
2373 2426
2374=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2375 2428
2376returns 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,
2377even if the object actually exists. May block. 2430even if the object actually exists. May block.
… …
2409can 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
2410dialogue with the given NPC character. 2463dialogue with the given NPC character.
2411 2464
2412=cut 2465=cut
2413 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
2414# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2482# with dialog boxes.
2416#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
2417sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2429 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2430 $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));
2431 2498
2432 } else { 2499 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2502 }
2436 } 2503 }
2437} 2504}
2438 2505
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2634} 2701}
2635 2702
2636sub prepare_random_map { 2703sub prepare_random_map {
2637 my ($exit) = @_; 2704 my ($exit) = @_;
2638 2705
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2708 # that depends on the exit object
2644 2709
2645 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
… …
2647 if ($exit->map) { 2712 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2652 } 2719 }
2653 2720
2654 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2655 2722
2656 my $data = cf::encode_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2659 2726
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2729 undef $fh;
2663 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2664 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2667 } 2738 }
2668} 2739}
2669 2740
2670sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2672 2743
2673 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2674 2745
2675 if ($exit->slaying eq "/!") {
2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
2679 cf::sync_job { prepare_random_map $exit };
2680 }
2681
2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $hp = $exit->stats->hp;
2684 my $sp = $exit->stats->sp;
2685
2686 $self->enter_link; 2746 $self->enter_link;
2687 2747
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2692 (async { 2748 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2749 $Coro::current->{desc} = "enter_exit";
2694 2750
2695 $self->deactivate_recursive; # just to be sure
2696 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
2697 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2698 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
2699 1; 2772 1
2700 }) { 2773 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2702 . "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. "
2703 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2784 id => "infobox", 2857 id => "infobox",
2785 title => "Map Info", 2858 title => "Map Info",
2786 reply => undef, 2859 reply => undef,
2787 tooltip => "Information related to the maps", 2860 tooltip => "Information related to the maps",
2788 }, 2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2789); 2868);
2790 2869
2791sub cf::client::send_msg { 2870sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2793 2872
… …
3030 3109
3031The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
3032 3111
3033 cf::object 3112 cf::object
3034 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
3035 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
3036 3115
3037 cf::object::player 3116 cf::object::player
3038 player 3117 player
3039 3118
3040 cf::player 3119 cf::player
… …
3045 3124
3046=cut 3125=cut
3047 3126
3048for ( 3127for (
3049 ["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
3050 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3130 decrease split destroy)],
3052 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
3054 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
3055) { 3134) {
3056 no strict 'refs'; 3135 no strict 'refs';
… …
3264 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3266 } 3345 }
3267}; 3346};
3268 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}
3357
3269sub reload_regions { 3358sub reload_regions {
3270 # 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
3271 # for this (global event?) 3360 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3362
… …
3286} 3375}
3287 3376
3288sub reload_archetypes { 3377sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3380}
3297 3381
3298sub reload_treasures { 3382sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3301} 3385}
3302 3386
3303sub reload_resources { 3387sub reload_resources {
3304 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3305 3389
3390 reload_facedata;
3391 reload_archetypes;
3306 reload_regions; 3392 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3393 reload_treasures;
3311 3394
3312 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3313} 3396}
3314 3397
3315sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3316 reload_resources; 3403 reload_resources;
3317} 3404}
3318 3405
3319sub reload_config { 3406sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3433 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3348 }; 3435 };
3349 3436
3437 {
3438 my $guard = freeze_mainloop;
3350 reload_config; 3439 reload_config;
3351 db_init; 3440 db_init;
3352 load_extensions; 3441 load_extensions;
3353 3442
3354 $TICK_WATCHER->start;
3355 $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
3356 EV::loop; 3446 EV::loop;
3357} 3447}
3358 3448
3359############################################################################# 3449#############################################################################
3360# initialisation and cleanup 3450# initialisation and cleanup
… …
3367 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3368 }; 3458 };
3369 } 3459 }
3370} 3460}
3371 3461
3372sub write_runtime { 3462sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3374 3464
3375 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3377 3467
… …
3403 and return; 3493 and return;
3404 3494
3405 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3406 3496
3407 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 };
3408} 3541}
3409 3542
3410sub emergency_save() { 3543sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3412 3545
… …
3434 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3435 3568
3436 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3438 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";
3439 }; 3576 };
3440 3577
3441 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3442} 3579}
3443 3580
… …
3458 warn "reloading..."; 3595 warn "reloading...";
3459 3596
3460 warn "entering sync_job"; 3597 warn "entering sync_job";
3461 3598
3462 cf::sync_job { 3599 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3601 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3466 3603
3467 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3606
3470 # 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
… …
3595 3732
3596our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3598 3735
3599sub wait_for_tick { 3736sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3602 3738
3603 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3741 $signal->wait;
3606} 3742}
3607 3743
3608sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3611 3746
3612 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3749 $signal->wait;
3615} 3750}
3616 3751
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3752sub tick {
3618 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3619 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"
3620 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3621 return; 3756 return;
3622 } 3757 }
3623 3758
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 3760
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $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.;
3633 Coro::async_pool { 3763 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 3765 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3637 }; 3767 };
3638 } 3768 }
3639 3769
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3642 } 3772 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 3774 $sig->send;
3645 } 3775 }
3646 3776
3647 $LOAD = ($NOW - $tick_start) / $TICK; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 3779
3650 _post_tick; 3780 if (0) {
3651}; 3781 if ($NEXT_TICK) {
3652$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}
3653 3788
3654{ 3789{
3655 # configure BDB 3790 # configure BDB
3656 3791
3657 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3658 BDB::max_poll_reqs $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 3794 $AnyEvent::BDB::WATCHER->priority (1);
3660 3795
3661 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3663 $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
3664 | BDB::LOG_AUTOREMOVE, 1); 3799 | BDB::LOG_AUTOREMOVE, 1);
… …
3695{ 3830{
3696 # configure IO::AIO 3831 # configure IO::AIO
3697 3832
3698 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 3835 undef $AnyEvent::AIO::WATCHER;
3701} 3836}
3702 3837
3703my $_log_backtrace; 3838my $_log_backtrace;
3704 3839
3705sub _log_backtrace { 3840sub _log_backtrace {

Diff Legend

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