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.416 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.433 by root, Sat May 10 22:38:52 2008 UTC

… …
25use strict; 25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35 35
36use Coro 4.50 (); 36use Coro ();
37use Coro::State; 37use Coro::State;
38use Coro::Handle; 38use Coro::Handle;
39use Coro::EV; 39use Coro::EV;
40use Coro::Timer; 40use Coro::Timer;
41use Coro::Signal; 41use Coro::Signal;
42use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
43use Coro::AIO; 44use Coro::AIO;
44use Coro::BDB; 45use Coro::BDB;
45use Coro::Storable; 46use Coro::Storable;
46use Coro::Util (); 47use Coro::Util ();
47 48
… …
49use BDB (); 50use BDB ();
50use Data::Dumper; 51use Data::Dumper;
51use Digest::MD5; 52use Digest::MD5;
52use Fcntl; 53use Fcntl;
53use YAML (); 54use YAML ();
54use IO::AIO 2.51 (); 55use IO::AIO ();
55use Time::HiRes; 56use Time::HiRes;
56use Compress::LZF; 57use Compress::LZF;
57use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
58 61
59# configure various modules to our taste 62# configure various modules to our taste
60# 63#
61$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
62Coro::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
… …
90our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 95our %RESOURCE;
93 96
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 99our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
99 101
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 105our $DB_ENV;
105 106
… …
427 } 428 }
428 } 429 }
429}; 430};
430 431
431sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
432 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
433 436
434 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
436 439
… …
1139 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1142 1145
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1150 aio_close $fh;
1148 1151
1149 if (@$objs) { 1152 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1158 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1160 }
1158 } else { 1161 } else {
1159 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1160 } 1163 }
… …
1454 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1458 or return;
1456 1459
1457 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1458 or return; 1461 or return;
1462
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1462 } 1466 }
1463 } 1467 }
… …
1473 1477
1474 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1475 1479
1476 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1478 1484
1479 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1486 cf::cede_to_tick;
1481} 1487}
1482 1488
… …
1518 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1519 $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
1520 1526
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1525 1533
1526 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1574
1567 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1568 my $path = path $login; 1576 my $path = path $login;
1569 1577
1570 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1584 }
1576 1585
… …
1775our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1777 1786
1778sub generate_random_map { 1787sub generate_random_map {
1779 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
1780 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1793 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1906 1918
1907# the temporary/swap location 1919# the temporary/swap location
1908sub save_path { 1920sub save_path {
1909 my ($self) = @_; 1921 my ($self) = @_;
1910 1922
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1913} 1925}
1914 1926
1915# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1916sub uniq_path { 1928sub uniq_path {
1917 my ($self) = @_; 1929 my ($self) = @_;
1918 1930
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1921} 1933}
1922 1934
1923# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1924# all maps in C++... 1936# all maps in C++...
… …
2022 2034
2023 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
2025 2037
2026 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 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";
2029 2041
2030 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
2031 or return; 2043 or return;
2032 2044
2033 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
2036 or return; 2048 or return;
2037 2049
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2041 undef $guard1; 2054 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2055 $map->reset;
2044 return find $path; 2056 return find $path;
2045 } 2057 }
2046 2058
2047 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2110 } 2122 }
2111 2123
2112 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2114 2126
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2128 }
2117 2129
2118 $self->post_load; 2130 $self->post_load;
2119} 2131}
2120 2132
… …
2178 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2179 2191
2180 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2181 2193
2182 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2196 }
2185 2197
2186 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2187 2199
2188 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
… …
2225 cf::async { 2237 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2228 }; 2240 };
2229 2241
2242 cf::get_slot 0.02;
2243
2230 if ($uniq) { 2244 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2247 } else {
2234 $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);
… …
2242 $self->save; 2256 $self->save;
2243 2257
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2259
2246 return if $self->players; 2260 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2249 2263
2250 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2251 2265
2252 $self->deactivate; 2266 $self->deactivate;
… …
2370 2384
2371sub unique_maps() { 2385sub unique_maps() {
2372 [ 2386 [
2373 map { 2387 map {
2374 utf8::decode $_; 2388 utf8::decode $_;
2375 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2376 ? normalise $_ 2392 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2394 ]
2380} 2395}
2381 2396
2382=back 2397=back
… …
2389 2404
2390=over 4 2405=over 4
2391 2406
2392=item $ob->inv_recursive 2407=item $ob->inv_recursive
2393 2408
2394Returns 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.
2395 2411
2396=cut 2412=cut
2397 2413
2398sub inv_recursive_; 2414sub inv_recursive_;
2399sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2405} 2421}
2406 2422
2407=item $ref = $ob->ref 2423=item $ref = $ob->ref
2408 2424
2409creates 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.
2410 2426
2411=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2412 2428
2413returns 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,
2414even if the object actually exists. May block. 2430even if the object actually exists. May block.
… …
2446can 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
2447dialogue with the given NPC character. 2463dialogue with the given NPC character.
2448 2464
2449=cut 2465=cut
2450 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
2451# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2482# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2498
2469 } else { 2499 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2502 }
2473 } 2503 }
2474} 2504}
2475 2505
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2671} 2701}
2672 2702
2673sub prepare_random_map { 2703sub prepare_random_map {
2674 my ($exit) = @_; 2704 my ($exit) = @_;
2675 2705
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2708 # that depends on the exit object
2681 2709
2682 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2712 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2689 } 2719 }
2690 2720
2691 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2692 2722
2693 my $data = cf::encode_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2696 2726
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2729 undef $fh;
2700 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2701 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2704 } 2738 }
2705} 2739}
2706 2740
2707sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2709 2743
2710 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2711 2745
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2746 $self->enter_link;
2724 2747
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2748 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2749 $Coro::current->{desc} = "enter_exit";
2731 2750
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2735 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
2736 1; 2772 1
2737 }) { 2773 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2821 id => "infobox", 2857 id => "infobox",
2822 title => "Map Info", 2858 title => "Map Info",
2823 reply => undef, 2859 reply => undef,
2824 tooltip => "Information related to the maps", 2860 tooltip => "Information related to the maps",
2825 }, 2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2826); 2868);
2827 2869
2828sub cf::client::send_msg { 2870sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2872
… …
3067 3109
3068The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
3069 3111
3070 cf::object 3112 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
3073 3115
3074 cf::object::player 3116 cf::object::player
3075 player 3117 player
3076 3118
3077 cf::player 3119 cf::player
… …
3082 3124
3083=cut 3125=cut
3084 3126
3085for ( 3127for (
3086 ["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
3087 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3130 decrease split destroy)],
3089 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
3091 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
3092) { 3134) {
3093 no strict 'refs'; 3135 no strict 'refs';
… …
3301 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3303 } 3345 }
3304}; 3346};
3305 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
3306sub reload_regions { 3358sub reload_regions {
3307 # 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
3308 # for this (global event?) 3360 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3362
… …
3323} 3375}
3324 3376
3325sub reload_archetypes { 3377sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3380}
3334 3381
3335sub reload_treasures { 3382sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3338} 3385}
3339 3386
3340sub reload_resources { 3387sub reload_resources {
3341 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3342 3389
3390 reload_facedata;
3391 reload_archetypes;
3343 reload_regions; 3392 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3393 reload_treasures;
3348 3394
3349 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3350} 3396}
3351 3397
3352sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3353 reload_resources; 3401 reload_resources;
3354} 3402}
3355 3403
3356sub reload_config { 3404sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3405 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3430 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3431 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3432 })->prio (Coro::PRIO_MAX);
3385 }; 3433 };
3386 3434
3435 {
3436 my $guard = freeze_mainloop;
3387 reload_config; 3437 reload_config;
3388 db_init; 3438 db_init;
3389 load_extensions; 3439 load_extensions;
3390 3440
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3441 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3442 evthread_start IO::AIO::poll_fileno;
3443 }
3444
3393 EV::loop; 3445 EV::loop;
3394} 3446}
3395 3447
3396############################################################################# 3448#############################################################################
3397# initialisation and cleanup 3449# initialisation and cleanup
… …
3404 cf::cleanup "SIG$signal"; 3456 cf::cleanup "SIG$signal";
3405 }; 3457 };
3406 } 3458 }
3407} 3459}
3408 3460
3409sub write_runtime { 3461sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3462 my $runtime = "$LOCALDIR/runtime";
3411 3463
3412 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
3414 3466
… …
3542 warn "reloading..."; 3594 warn "reloading...";
3543 3595
3544 warn "entering sync_job"; 3596 warn "entering sync_job";
3545 3597
3546 cf::sync_job { 3598 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3600 cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
3550 3602
3551 warn "syncing database to disk"; 3603 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3605
3554 # if anything goes wrong in here, we should simply crash as we already saved 3606 # if anything goes wrong in here, we should simply crash as we already saved
… …
3679 3731
3680our @WAIT_FOR_TICK; 3732our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3733our @WAIT_FOR_TICK_BEGIN;
3682 3734
3683sub wait_for_tick { 3735sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3736 return if tick_inhibit || $Coro::current == $Coro::main;
3686 3737
3687 my $signal = new Coro::Signal; 3738 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3739 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3740 $signal->wait;
3690} 3741}
3691 3742
3692sub wait_for_tick_begin { 3743sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3744 return if tick_inhibit || $Coro::current == $Coro::main;
3695 3745
3696 my $signal = new Coro::Signal; 3746 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3747 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3748 $signal->wait;
3699} 3749}
… …
3709 3759
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3760 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3761 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3712 Coro::async_pool { 3762 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 3763 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 3764 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 3765 or warn "ERROR: unable to write runtime file: $!";
3716 }; 3766 };
3717 } 3767 }
3718 3768
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3769 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3738{ 3788{
3739 # configure BDB 3789 # configure BDB
3740 3790
3741 BDB::min_parallel 8; 3791 BDB::min_parallel 8;
3742 BDB::max_poll_reqs $TICK * 0.1; 3792 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3793 $AnyEvent::BDB::WATCHER->priority (1);
3744 3794
3745 unless ($DB_ENV) { 3795 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3796 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3797 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3748 | BDB::LOG_AUTOREMOVE, 1); 3798 | BDB::LOG_AUTOREMOVE, 1);
… …
3779{ 3829{
3780 # configure IO::AIO 3830 # configure IO::AIO
3781 3831
3782 IO::AIO::min_parallel 8; 3832 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 3833 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 3834 $AnyEvent::AIO::WATCHER->priority (1);
3785} 3835}
3786 3836
3787my $_log_backtrace; 3837my $_log_backtrace;
3788 3838
3789sub _log_backtrace { 3839sub _log_backtrace {

Diff Legend

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