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.409 by root, Mon Jan 14 11:41:48 2008 UTC vs.
Revision 1.430 by root, Sun May 4 14:12: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 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.32 (); 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;
… …
69our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 92our %RESOURCE;
72 93
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 97our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
79 99
… …
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 118
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
102 123
103binmode STDOUT; 124binmode STDOUT;
104binmode STDERR; 125binmode STDERR;
105 126
106# read virtual server time, if available 127# read virtual server time, if available
… …
192 LOG llevError, $msg; 213 LOG llevError, $msg;
193 }; 214 };
194} 215}
195 216
196$Coro::State::DIEHOOK = sub { 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
197 warn Carp::longmess $_[0]; 226 warn Carp::longmess $_[0];
198 Coro::terminate; 227 Coro::terminate
199}; 228};
229
230$SIG{__DIE__} = sub { }; #d#?
200 231
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
329 360
330 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
331} 362}
332 363
333sub freeze_mainloop { 364sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
335 366
336 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 368}
342 369
343=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
344 371
345Like 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
… …
400 } 427 }
401 } 428 }
402}; 429};
403 430
404sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
405 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
406 435
407 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
409 438
… …
446 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
448 477
449 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
450 479
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
454 481
455 my $busy = 1; 482 my $busy = 1;
456 my @res; 483 my @res;
457 484
… …
468 } else { 495 } else {
469 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
470 } 497 }
471 } 498 }
472 499
473 $time = EV::time - $time; 500 my $time = EV::time - $time;
474 501
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
479 503
480 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
481 } else { 505 } else {
482 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
483 507
… …
525 reset_signals; 549 reset_signals;
526 &$cb 550 &$cb
527 }, @args; 551 }, @args;
528 552
529 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
530} 581}
531 582
532=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
533 584
534Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1090 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1093 1144
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1098 close $fh; 1149 aio_close $fh;
1099 1150
1100 if (@$objs) { 1151 if (@$objs) {
1101 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) {
1102 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1105 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1106 close $fh; 1157 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1159 }
1109 } else { 1160 } else {
1110 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1111 } 1162 }
… …
1306 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1308 1359
1309 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1310 warn $msg; 1361 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1312 exit 1;
1313 } 1363 }
1314 1364
1315 warn $msg; 1365 warn $msg;
1316 } 1366 }
1317 1367
… …
1406 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1457 or return;
1408 1458
1409 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1410 or return; 1460 or return;
1461
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1414 } 1465 }
1415 } 1466 }
… …
1425 1476
1426 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1427 1478
1428 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1430 1483
1431 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1485 cf::cede_to_tick;
1433} 1486}
1434 1487
… …
1518 1571
1519 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1520 my $path = path $login; 1573 my $path = path $login;
1521 1574
1522 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1581 }
1528 1582
… …
1727our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1729 1783
1730sub generate_random_map { 1784sub generate_random_map {
1731 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1732 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1790 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1858 1915
1859# the temporary/swap location 1916# the temporary/swap location
1860sub save_path { 1917sub save_path {
1861 my ($self) = @_; 1918 my ($self) = @_;
1862 1919
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1865} 1922}
1866 1923
1867# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1868sub uniq_path { 1925sub uniq_path {
1869 my ($self) = @_; 1926 my ($self) = @_;
1870 1927
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1873} 1930}
1874 1931
1875# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1876# all maps in C++... 1933# all maps in C++...
… …
1974 2031
1975 cf::lock_wait "map_data:$path";#d#remove 2032 cf::lock_wait "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1977 2034
1978 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
1981 2038
1982 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1983 or return; 2040 or return;
1984 2041
1985 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
… …
1988 or return; 2045 or return;
1989 2046
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1993 undef $guard1; 2051 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2052 $map->reset;
1996 return find $path; 2053 return find $path;
1997 } 2054 }
1998 2055
1999 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
… …
2062 } 2119 }
2063 2120
2064 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
2066 2123
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2125 }
2069 2126
2070 $self->post_load; 2127 $self->post_load;
2071} 2128}
2072 2129
… …
2130 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2131 2188
2132 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2133 2190
2134 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2193 }
2137 2194
2138 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2139 2196
2140 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
… …
2177 cf::async { 2234 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2180 }; 2237 };
2181 2238
2239 cf::get_slot 0.02;
2240
2182 if ($uniq) { 2241 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2244 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2194 $self->save; 2253 $self->save;
2195 2254
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2256
2198 return if $self->players; 2257 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2200 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2201 2260
2202 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2203 2262
2204 $self->deactivate; 2263 $self->deactivate;
… …
2322 2381
2323sub unique_maps() { 2382sub unique_maps() {
2324 [ 2383 [
2325 map { 2384 map {
2326 utf8::decode $_; 2385 utf8::decode $_;
2327 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2328 ? normalise $_ 2389 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2391 ]
2332} 2392}
2333 2393
2334package cf;
2335
2336=back 2394=back
2337 2395
2338=head3 cf::object 2396=head3 cf::object
2339 2397
2340=cut 2398=cut
… …
2343 2401
2344=over 4 2402=over 4
2345 2403
2346=item $ob->inv_recursive 2404=item $ob->inv_recursive
2347 2405
2348Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2349 2408
2350=cut 2409=cut
2351 2410
2352sub inv_recursive_; 2411sub inv_recursive_;
2353sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2358 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2359} 2418}
2360 2419
2361=item $ref = $ob->ref 2420=item $ref = $ob->ref
2362 2421
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2364 2423
2365=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2366 2425
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2427even if the object actually exists. May block.
… …
2400can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2460dialogue with the given NPC character.
2402 2461
2403=cut 2462=cut
2404 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2405# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2479# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
… …
2420 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2495
2423 } else { 2496 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2499 }
2427 } 2500 }
2428} 2501}
2429 2502
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2625} 2698}
2626 2699
2627sub prepare_random_map { 2700sub prepare_random_map {
2628 my ($exit) = @_; 2701 my ($exit) = @_;
2629 2702
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2703 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2704 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2705 # that depends on the exit object
2635 2706
2636 my $rmp = parse_random_map_params $exit->msg; 2707 my $rmp = parse_random_map_params $exit->msg;
… …
2638 if ($exit->map) { 2709 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2710 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2711 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2712 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2713 $rmp->{origin_y} = $exit->y;
2714
2715 $exit->map->touch;
2643 } 2716 }
2644 2717
2645 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2646 2719
2647 my $data = cf::encode_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2650 2723
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2726 undef $fh;
2654 aio_rename "$meta~", $meta; 2727 aio_rename "$meta~", $meta;
2655 2728
2729 my $slaying = "?random/$md5";
2730
2731 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2732 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2733 $exit->msg (undef);
2734 }
2658 } 2735 }
2659} 2736}
2660 2737
2661sub cf::object::player::enter_exit { 2738sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2739 my ($self, $exit) = @_;
2663 2740
2664 return unless $self->type == cf::PLAYER; 2741 return unless $self->type == cf::PLAYER;
2665 2742
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2743 $self->enter_link;
2678 2744
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2745 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2746 $Coro::current->{desc} = "enter_exit";
2685 2747
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2748 unless (eval {
2749 $self->deactivate_recursive; # just to be sure
2750
2751 # random map handling
2752 {
2753 my $guard = cf::lock_acquire "exit_prepare:$exit";
2754
2755 prepare_random_map $exit
2756 if $exit->slaying eq "/!";
2757 }
2758
2759 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2760 my $x = $exit->stats->hp;
2761 my $y = $exit->stats->sp;
2762
2688 $self->goto ($slaying, $hp, $sp); 2763 $self->goto ($map, $x, $y);
2689 2764
2765 # if exit is damned, update players death & WoR home-position
2766 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED);
2768
2690 1; 2769 1
2691 }) { 2770 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2771 $self->message ("Something went wrong deep within the crossfire server. "
2693 . "I'll try to bring you back to the map you were before. " 2772 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2773 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2774 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2775 id => "infobox", 2854 id => "infobox",
2776 title => "Map Info", 2855 title => "Map Info",
2777 reply => undef, 2856 reply => undef,
2778 tooltip => "Information related to the maps", 2857 tooltip => "Information related to the maps",
2779 }, 2858 },
2859 "c/party" => {
2860 id => "party",
2861 title => "Party",
2862 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party",
2864 },
2780); 2865);
2781 2866
2782sub cf::client::send_msg { 2867sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 2868 my ($self, $channel, $msg, $color, @extra) = @_;
2784 2869
… …
3021 3106
3022The following functions and methods are available within a safe environment: 3107The following functions and methods are available within a safe environment:
3023 3108
3024 cf::object 3109 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3110 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3111 insert remove name archname title slaying race decrease split
3027 3112
3028 cf::object::player 3113 cf::object::player
3029 player 3114 player
3030 3115
3031 cf::player 3116 cf::player
… …
3037=cut 3122=cut
3038 3123
3039for ( 3124for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3126 insert remove inv name archname title slaying race
3042 decrease_ob_nr destroy)], 3127 decrease split destroy)],
3043 ["cf::object::player" => qw(player)], 3128 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3129 ["cf::player" => qw(peaceful)],
3045 ["cf::map" => qw(trigger)], 3130 ["cf::map" => qw(trigger)],
3046) { 3131) {
3047 no strict 'refs'; 3132 no strict 'refs';
… …
3255 while (my ($k, $v) = each %$want) { 3340 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3341 $ns->fx_want ($k, $v);
3257 } 3342 }
3258}; 3343};
3259 3344
3345sub load_resource_file($) {
3346 my $guard = lock_acquire "load_resource_file";
3347
3348 my $status = load_resource_file_ $_[0];
3349 get_slot 0.1, 100;
3350 cf::arch::commit_load;
3351
3352 $status
3353}
3354
3260sub reload_regions { 3355sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3356 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3357 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3358 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3359
… …
3277} 3372}
3278 3373
3279sub reload_archetypes { 3374sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3375 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3376 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3377}
3288 3378
3289sub reload_treasures { 3379sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3380 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3381 or die "unable to load treasurelists\n";
3292} 3382}
3293 3383
3294sub reload_resources { 3384sub reload_resources {
3295 warn "reloading resource files...\n"; 3385 warn "reloading resource files...\n";
3296 3386
3387 reload_facedata;
3388 reload_archetypes;
3297 reload_regions; 3389 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3390 reload_treasures;
3302 3391
3303 warn "finished reloading resource files\n"; 3392 warn "finished reloading resource files\n";
3304} 3393}
3305 3394
3306sub init { 3395sub init {
3396 my $guard = freeze_mainloop;
3397
3307 reload_resources; 3398 reload_resources;
3308} 3399}
3309 3400
3310sub reload_config { 3401sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3427 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3428 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3429 })->prio (Coro::PRIO_MAX);
3339 }; 3430 };
3340 3431
3432 {
3433 my $guard = freeze_mainloop;
3341 reload_config; 3434 reload_config;
3342 db_init; 3435 db_init;
3343 load_extensions; 3436 load_extensions;
3344 3437
3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3439 evthread_start IO::AIO::poll_fileno;
3440 }
3441
3347 EV::loop; 3442 EV::loop;
3348} 3443}
3349 3444
3350############################################################################# 3445#############################################################################
3351# initialisation and cleanup 3446# initialisation and cleanup
… …
3358 cf::cleanup "SIG$signal"; 3453 cf::cleanup "SIG$signal";
3359 }; 3454 };
3360 } 3455 }
3361} 3456}
3362 3457
3363sub write_runtime { 3458sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3459 my $runtime = "$LOCALDIR/runtime";
3365 3460
3366 # first touch the runtime file to show we are still running: 3461 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3462 # the fsync below can take a very very long time.
3368 3463
… …
3394 and return; 3489 and return;
3395 3490
3396 warn "runtime file written.\n"; 3491 warn "runtime file written.\n";
3397 3492
3398 1 3493 1
3494}
3495
3496our $uuid_lock;
3497our $uuid_skip;
3498
3499sub write_uuid_sync($) {
3500 $uuid_skip ||= $_[0];
3501
3502 return if $uuid_lock;
3503 local $uuid_lock = 1;
3504
3505 my $uuid = "$LOCALDIR/uuid";
3506
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return;
3509
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3511 $uuid_skip = 0;
3512
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return;
3515
3516 # always fsync - this file is important
3517 aio_fsync $fh
3518 and return;
3519
3520 close $fh
3521 or return;
3522
3523 aio_rename "$uuid~", $uuid
3524 and return;
3525
3526 warn "uuid file written ($value).\n";
3527
3528 1
3529
3530}
3531
3532sub write_uuid($$) {
3533 my ($skip, $sync) = @_;
3534
3535 $sync ? write_uuid_sync $skip
3536 : async { write_uuid_sync $skip };
3399} 3537}
3400 3538
3401sub emergency_save() { 3539sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3403 3541
… …
3425 warn "end emergency map save\n"; 3563 warn "end emergency map save\n";
3426 3564
3427 warn "begin emergency database checkpoint\n"; 3565 warn "begin emergency database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3567 warn "end emergency database checkpoint\n";
3568
3569 warn "begin write uuid\n";
3570 write_uuid_sync 1;
3571 warn "end write uuid\n";
3430 }; 3572 };
3431 3573
3432 warn "leave emergency perl save\n"; 3574 warn "leave emergency perl save\n";
3433} 3575}
3434 3576
… …
3449 warn "reloading..."; 3591 warn "reloading...";
3450 3592
3451 warn "entering sync_job"; 3593 warn "entering sync_job";
3452 3594
3453 cf::sync_job { 3595 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3597 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3457 3599
3458 warn "syncing database to disk"; 3600 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3602
3461 # if anything goes wrong in here, we should simply crash as we already saved 3603 # if anything goes wrong in here, we should simply crash as we already saved
… …
3548 warn "leaving sync_job"; 3690 warn "leaving sync_job";
3549 3691
3550 1 3692 1
3551 } or do { 3693 } or do {
3552 warn $@; 3694 warn $@;
3553 warn "error while reloading, exiting."; 3695 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3696 };
3556 3697
3557 warn "reloaded"; 3698 warn "reloaded";
3558}; 3699};
3559 3700
… …
3587 3728
3588our @WAIT_FOR_TICK; 3729our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3730our @WAIT_FOR_TICK_BEGIN;
3590 3731
3591sub wait_for_tick { 3732sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3594 3734
3595 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3736 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3737 $signal->wait;
3598} 3738}
3599 3739
3600sub wait_for_tick_begin { 3740sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3603 3742
3604 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3744 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3745 $signal->wait;
3607} 3746}
3608 3747
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3748sub tick {
3610 if ($Coro::current != $Coro::main) { 3749 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3750 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 3751 unless ++$bug_warning > 10;
3613 return; 3752 return;
3614 } 3753 }
3615 3754
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3755 cf::server_tick; # one server iteration
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 3756
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3757 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 3759 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3760 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3761 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3762 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3763 };
3630 } 3764 }
3631 3765
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3634 } 3768 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3769 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3770 $sig->send;
3637 } 3771 }
3638 3772
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3773 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3774 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3775
3642 _post_tick; 3776 if (0) {
3643}; 3777 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 3778 my $jitter = $TICK_START - $NEXT_TICK;
3779 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3780 warn "jitter $JITTER\n";#d#
3781 }
3782 }
3783}
3645 3784
3646{ 3785{
3647 # configure BDB 3786 # configure BDB
3648 3787
3649 BDB::min_parallel 8; 3788 BDB::min_parallel 8;

Diff Legend

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