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.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.432 by root, Mon May 5 22:38:47 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 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
… …
1470 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1524 $pl->password ("*"); # this should lock out the player until we nuked the dir
1472 1525
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1477 1532
1478 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1518 1573
1519 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1520 my $path = path $login; 1575 my $path = path $login;
1521 1576
1522 # a .pst is a dead give-away for a valid player 1577 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1583 }
1528 1584
… …
1727our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1729 1785
1730sub generate_random_map { 1786sub generate_random_map {
1731 my ($self, $rmp) = @_; 1787 my ($self, $rmp) = @_;
1788
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790
1732 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1792 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1858 1917
1859# the temporary/swap location 1918# the temporary/swap location
1860sub save_path { 1919sub save_path {
1861 my ($self) = @_; 1920 my ($self) = @_;
1862 1921
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1865} 1924}
1866 1925
1867# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1868sub uniq_path { 1927sub uniq_path {
1869 my ($self) = @_; 1928 my ($self) = @_;
1870 1929
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1873} 1932}
1874 1933
1875# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1876# all maps in C++... 1935# all maps in C++...
… …
1974 2033
1975 cf::lock_wait "map_data:$path";#d#remove 2034 cf::lock_wait "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1977 2036
1978 $cf::MAP{$path} || do { 2037 $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 2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2039 my $guard2 = cf::lock_acquire "map_find:$path";
1981 2040
1982 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1983 or return; 2042 or return;
1984 2043
1985 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
… …
1988 or return; 2047 or return;
1989 2048
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
1993 undef $guard1; 2053 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2054 $map->reset;
1996 return find $path; 2055 return find $path;
1997 } 2056 }
1998 2057
1999 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
… …
2062 } 2121 }
2063 2122
2064 $self->{last_save} = $cf::RUNTIME; 2123 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2124 $self->last_access ($cf::RUNTIME);
2066 2125
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2127 }
2069 2128
2070 $self->post_load; 2129 $self->post_load;
2071} 2130}
2072 2131
… …
2130 my ($path, $origin, $load) = @_; 2189 my ($path, $origin, $load) = @_;
2131 2190
2132 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
2133 2192
2134 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2195 }
2137 2196
2138 $MAP_PREFETCH{$path} |= $load; 2197 $MAP_PREFETCH{$path} |= $load;
2139 2198
2140 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
… …
2177 cf::async { 2236 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2237 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
2180 }; 2239 };
2181 2240
2241 cf::get_slot 0.02;
2242
2182 if ($uniq) { 2243 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2246 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2194 $self->save; 2255 $self->save;
2195 2256
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2258
2198 return if $self->players; 2259 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
2200 return if $self->{deny_save}; 2261 return if $self->{deny_save};
2201 2262
2202 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2203 2264
2204 $self->deactivate; 2265 $self->deactivate;
… …
2322 2383
2323sub unique_maps() { 2384sub unique_maps() {
2324 [ 2385 [
2325 map { 2386 map {
2326 utf8::decode $_; 2387 utf8::decode $_;
2327 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2328 ? normalise $_ 2391 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2393 ]
2332} 2394}
2333 2395
2334package cf;
2335
2336=back 2396=back
2337 2397
2338=head3 cf::object 2398=head3 cf::object
2339 2399
2340=cut 2400=cut
… …
2343 2403
2344=over 4 2404=over 4
2345 2405
2346=item $ob->inv_recursive 2406=item $ob->inv_recursive
2347 2407
2348Returns the inventory of the object _and_ their inventories, recursively. 2408Returns the inventory of the object I<and> their inventories, recursively,
2409but I<not> the object itself.
2349 2410
2350=cut 2411=cut
2351 2412
2352sub inv_recursive_; 2413sub inv_recursive_;
2353sub inv_recursive_ { 2414sub inv_recursive_ {
… …
2358 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2359} 2420}
2360 2421
2361=item $ref = $ob->ref 2422=item $ref = $ob->ref
2362 2423
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2424Creates and returns a persistent reference to an object that can be stored as a string.
2364 2425
2365=item $ob = cf::object::deref ($refstring) 2426=item $ob = cf::object::deref ($refstring)
2366 2427
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2428returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2429even if the object actually exists. May block.
… …
2400can be C<undef>. Does the right thing when the player is currently in a 2461can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2462dialogue with the given NPC character.
2402 2463
2403=cut 2464=cut
2404 2465
2466our $SAY_CHANNEL = {
2467 id => "say",
2468 title => "Map",
2469 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2471};
2472
2473our $CHAT_CHANNEL = {
2474 id => "chat",
2475 title => "Chat",
2476 reply => "chat ",
2477 tooltip => "Player chat and shouts, global to the server.",
2478};
2479
2405# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2481# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2482#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2484 my ($self, $npc, $msg, $flags) = @_;
… …
2420 my $dialog = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2497
2423 } else { 2498 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2501 }
2427 } 2502 }
2428} 2503}
2429 2504
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2505=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2625} 2700}
2626 2701
2627sub prepare_random_map { 2702sub prepare_random_map {
2628 my ($exit) = @_; 2703 my ($exit) = @_;
2629 2704
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2707 # that depends on the exit object
2635 2708
2636 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
… …
2638 if ($exit->map) { 2711 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2643 } 2718 }
2644 2719
2645 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2646 2721
2647 my $data = cf::encode_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2650 2725
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2728 undef $fh;
2654 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2655 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2658 } 2737 }
2659} 2738}
2660 2739
2661sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2663 2742
2664 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2665 2744
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; 2745 $self->enter_link;
2678 2746
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 { 2747 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2748 $Coro::current->{desc} = "enter_exit";
2685 2749
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2750 unless (eval {
2751 $self->deactivate_recursive; # just to be sure
2752
2753 # random map handling
2754 {
2755 my $guard = cf::lock_acquire "exit_prepare:$exit";
2756
2757 prepare_random_map $exit
2758 if $exit->slaying eq "/!";
2759 }
2760
2761 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2762 my $x = $exit->stats->hp;
2763 my $y = $exit->stats->sp;
2764
2688 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2689 2766
2767 # if exit is damned, update players death & WoR home-position
2768 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED);
2770
2690 1; 2771 1
2691 }) { 2772 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2693 . "I'll try to bring you back to the map you were before. " 2774 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2775 id => "infobox", 2856 id => "infobox",
2776 title => "Map Info", 2857 title => "Map Info",
2777 reply => undef, 2858 reply => undef,
2778 tooltip => "Information related to the maps", 2859 tooltip => "Information related to the maps",
2779 }, 2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2780); 2867);
2781 2868
2782sub cf::client::send_msg { 2869sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2784 2871
… …
3021 3108
3022The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
3023 3110
3024 cf::object 3111 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3112 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3113 insert remove name archname title slaying race decrease split
3027 3114
3028 cf::object::player 3115 cf::object::player
3029 player 3116 player
3030 3117
3031 cf::player 3118 cf::player
… …
3036 3123
3037=cut 3124=cut
3038 3125
3039for ( 3126for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3129 decrease split destroy)],
3043 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
3045 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3046) { 3133) {
3047 no strict 'refs'; 3134 no strict 'refs';
… …
3255 while (my ($k, $v) = each %$want) { 3342 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3343 $ns->fx_want ($k, $v);
3257 } 3344 }
3258}; 3345};
3259 3346
3347sub load_resource_file($) {
3348 my $guard = lock_acquire "load_resource_file";
3349
3350 my $status = load_resource_file_ $_[0];
3351 get_slot 0.1, 100;
3352 cf::arch::commit_load;
3353
3354 $status
3355}
3356
3260sub reload_regions { 3357sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3358 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3359 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3361
… …
3277} 3374}
3278 3375
3279sub reload_archetypes { 3376sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3378 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} 3379}
3288 3380
3289sub reload_treasures { 3381sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
3292} 3384}
3293 3385
3294sub reload_resources { 3386sub reload_resources {
3295 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
3296 3388
3389 reload_facedata;
3390 reload_archetypes;
3297 reload_regions; 3391 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3392 reload_treasures;
3302 3393
3303 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
3304} 3395}
3305 3396
3306sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
3307 reload_resources; 3400 reload_resources;
3308} 3401}
3309 3402
3310sub reload_config { 3403sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3430 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
3339 }; 3432 };
3340 3433
3434 {
3435 my $guard = freeze_mainloop;
3341 reload_config; 3436 reload_config;
3342 db_init; 3437 db_init;
3343 load_extensions; 3438 load_extensions;
3344 3439
3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
3347 EV::loop; 3444 EV::loop;
3348} 3445}
3349 3446
3350############################################################################# 3447#############################################################################
3351# initialisation and cleanup 3448# initialisation and cleanup
… …
3358 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
3359 }; 3456 };
3360 } 3457 }
3361} 3458}
3362 3459
3363sub write_runtime { 3460sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
3365 3462
3366 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
3368 3465
… …
3394 and return; 3491 and return;
3395 3492
3396 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
3397 3494
3398 1 3495 1
3496}
3497
3498our $uuid_lock;
3499our $uuid_skip;
3500
3501sub write_uuid_sync($) {
3502 $uuid_skip ||= $_[0];
3503
3504 return if $uuid_lock;
3505 local $uuid_lock = 1;
3506
3507 my $uuid = "$LOCALDIR/uuid";
3508
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return;
3511
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
3399} 3539}
3400 3540
3401sub emergency_save() { 3541sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3403 3543
… …
3425 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
3426 3566
3427 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3569 warn "end emergency database checkpoint\n";
3570
3571 warn "begin write uuid\n";
3572 write_uuid_sync 1;
3573 warn "end write uuid\n";
3430 }; 3574 };
3431 3575
3432 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
3433} 3577}
3434 3578
… …
3449 warn "reloading..."; 3593 warn "reloading...";
3450 3594
3451 warn "entering sync_job"; 3595 warn "entering sync_job";
3452 3596
3453 cf::sync_job { 3597 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3599 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3457 3601
3458 warn "syncing database to disk"; 3602 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3604
3461 # if anything goes wrong in here, we should simply crash as we already saved 3605 # if anything goes wrong in here, we should simply crash as we already saved
… …
3548 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3549 3693
3550 1 3694 1
3551 } or do { 3695 } or do {
3552 warn $@; 3696 warn $@;
3553 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3698 };
3556 3699
3557 warn "reloaded"; 3700 warn "reloaded";
3558}; 3701};
3559 3702
… …
3562sub reload_perl() { 3705sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
3565 3708
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3710 do_reload_perl;
3567 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
3568 do_reload_perl;
3569 }; 3712 };
3570} 3713}
3571 3714
3572register_command "reload" => sub { 3715register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
… …
3587 3730
3588our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3590 3733
3591sub wait_for_tick { 3734sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3594 3736
3595 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3739 $signal->wait;
3598} 3740}
3599 3741
3600sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3603 3744
3604 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3747 $signal->wait;
3607} 3748}
3608 3749
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3750sub tick {
3610 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3752 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3613 return; 3754 return;
3614 } 3755 }
3615 3756
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 3758
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 3761 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3762 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3763 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3764 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3765 };
3630 } 3766 }
3631 3767
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3634 } 3770 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3772 $sig->send;
3637 } 3773 }
3638 3774
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3777
3642 _post_tick; 3778 if (0) {
3643}; 3779 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 3780 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d#
3783 }
3784 }
3785}
3645 3786
3646{ 3787{
3647 # configure BDB 3788 # configure BDB
3648 3789
3649 BDB::min_parallel 8; 3790 BDB::min_parallel 8;

Diff Legend

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