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

Diff Legend

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