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.413 by root, Sun Apr 6 16:13:20 2008 UTC vs.
Revision 1.432 by root, Mon May 5 22:38:47 2008 UTC

… …
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35 35
36use Coro 4.32 (); 36use Coro 4.50 ();
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;
… …
427 } 427 }
428 } 428 }
429}; 429};
430 430
431sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
432 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
433 435
434 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
436 438
… …
547 reset_signals; 549 reset_signals;
548 &$cb 550 &$cb
549 }, @args; 551 }, @args;
550 552
551 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
552} 581}
553 582
554=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
555 584
556Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1112 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1115 1144
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1149 aio_close $fh;
1121 1150
1122 if (@$objs) { 1151 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1157 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1159 }
1131 } else { 1160 } else {
1132 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1133 } 1162 }
… …
1427 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1457 or return;
1429 1458
1430 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1431 or return; 1460 or return;
1461
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1435 } 1465 }
1436 } 1466 }
… …
1446 1476
1447 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1448 1478
1449 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1451 1483
1452 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1485 cf::cede_to_tick;
1454} 1486}
1455 1487
… …
1491 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1492 $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
1493 1525
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1498 1532
1499 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1539 1573
1540 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1541 my $path = path $login; 1575 my $path = path $login;
1542 1576
1543 # a .pst is a dead give-away for a valid player 1577 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1583 }
1549 1584
… …
1748our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1750 1785
1751sub generate_random_map { 1786sub generate_random_map {
1752 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
1753 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1792 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1917
1880# the temporary/swap location 1918# the temporary/swap location
1881sub save_path { 1919sub save_path {
1882 my ($self) = @_; 1920 my ($self) = @_;
1883 1921
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1886} 1924}
1887 1925
1888# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1889sub uniq_path { 1927sub uniq_path {
1890 my ($self) = @_; 1928 my ($self) = @_;
1891 1929
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1894} 1932}
1895 1933
1896# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1897# all maps in C++... 1935# all maps in C++...
… …
1995 2033
1996 cf::lock_wait "map_data:$path";#d#remove 2034 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1998 2036
1999 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 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";
2002 2040
2003 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
2004 or return; 2042 or return;
2005 2043
2006 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
… …
2009 or return; 2047 or return;
2010 2048
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
2014 undef $guard1; 2053 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2054 $map->reset;
2017 return find $path; 2055 return find $path;
2018 } 2056 }
2019 2057
2020 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
… …
2083 } 2121 }
2084 2122
2085 $self->{last_save} = $cf::RUNTIME; 2123 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2124 $self->last_access ($cf::RUNTIME);
2087 2125
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2127 }
2090 2128
2091 $self->post_load; 2129 $self->post_load;
2092} 2130}
2093 2131
… …
2151 my ($path, $origin, $load) = @_; 2189 my ($path, $origin, $load) = @_;
2152 2190
2153 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
2154 2192
2155 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2195 }
2158 2196
2159 $MAP_PREFETCH{$path} |= $load; 2197 $MAP_PREFETCH{$path} |= $load;
2160 2198
2161 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2236 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2237 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
2201 }; 2239 };
2202 2240
2241 cf::get_slot 0.02;
2242
2203 if ($uniq) { 2243 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2246 } else {
2207 $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);
… …
2215 $self->save; 2255 $self->save;
2216 2256
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2258
2219 return if $self->players; 2259 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2261 return if $self->{deny_save};
2222 2262
2223 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2224 2264
2225 $self->deactivate; 2265 $self->deactivate;
… …
2343 2383
2344sub unique_maps() { 2384sub unique_maps() {
2345 [ 2385 [
2346 map { 2386 map {
2347 utf8::decode $_; 2387 utf8::decode $_;
2348 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2349 ? normalise $_ 2391 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2393 ]
2353} 2394}
2354 2395
2355package cf;
2356
2357=back 2396=back
2358 2397
2359=head3 cf::object 2398=head3 cf::object
2360 2399
2361=cut 2400=cut
… …
2364 2403
2365=over 4 2404=over 4
2366 2405
2367=item $ob->inv_recursive 2406=item $ob->inv_recursive
2368 2407
2369Returns 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.
2370 2410
2371=cut 2411=cut
2372 2412
2373sub inv_recursive_; 2413sub inv_recursive_;
2374sub inv_recursive_ { 2414sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2380} 2420}
2381 2421
2382=item $ref = $ob->ref 2422=item $ref = $ob->ref
2383 2423
2384creates 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.
2385 2425
2386=item $ob = cf::object::deref ($refstring) 2426=item $ob = cf::object::deref ($refstring)
2387 2427
2388returns 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,
2389even if the object actually exists. May block. 2429even if the object actually exists. May block.
… …
2421can 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
2422dialogue with the given NPC character. 2462dialogue with the given NPC character.
2423 2463
2424=cut 2464=cut
2425 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
2426# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2481# with dialog boxes.
2428#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
2429sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2484 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2442 $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));
2443 2497
2444 } else { 2498 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2501 }
2448 } 2502 }
2449} 2503}
2450 2504
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2505=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2646} 2700}
2647 2701
2648sub prepare_random_map { 2702sub prepare_random_map {
2649 my ($exit) = @_; 2703 my ($exit) = @_;
2650 2704
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2707 # that depends on the exit object
2656 2708
2657 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2711 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2664 } 2718 }
2665 2719
2666 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2667 2721
2668 my $data = cf::encode_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2671 2725
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2728 undef $fh;
2675 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2676 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2679 } 2737 }
2680} 2738}
2681 2739
2682sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2684 2742
2685 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2686 2744
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2745 $self->enter_link;
2699 2746
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2747 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2748 $Coro::current->{desc} = "enter_exit";
2706 2749
2707 $self->deactivate_recursive; # just to be sure
2708 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
2709 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2710 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
2711 1; 2771 1
2712 }) { 2772 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2714 . "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. "
2715 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2796 id => "infobox", 2856 id => "infobox",
2797 title => "Map Info", 2857 title => "Map Info",
2798 reply => undef, 2858 reply => undef,
2799 tooltip => "Information related to the maps", 2859 tooltip => "Information related to the maps",
2800 }, 2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2801); 2867);
2802 2868
2803sub cf::client::send_msg { 2869sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2871
… …
3042 3108
3043The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
3044 3110
3045 cf::object 3111 cf::object
3046 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
3047 insert remove name archname title slaying race decrease_ob_nr 3113 insert remove name archname title slaying race decrease split
3048 3114
3049 cf::object::player 3115 cf::object::player
3050 player 3116 player
3051 3117
3052 cf::player 3118 cf::player
… …
3057 3123
3058=cut 3124=cut
3059 3125
3060for ( 3126for (
3061 ["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
3062 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3129 decrease split destroy)],
3064 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3067) { 3133) {
3068 no strict 'refs'; 3134 no strict 'refs';
… …
3276 while (my ($k, $v) = each %$want) { 3342 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3343 $ns->fx_want ($k, $v);
3278 } 3344 }
3279}; 3345};
3280 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
3281sub reload_regions { 3357sub reload_regions {
3282 # 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
3283 # for this (global event?) 3359 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3361
… …
3298} 3374}
3299 3375
3300sub reload_archetypes { 3376sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3378 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3379}
3309 3380
3310sub reload_treasures { 3381sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
3313} 3384}
3314 3385
3315sub reload_resources { 3386sub reload_resources {
3316 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
3317 3388
3389 reload_facedata;
3390 reload_archetypes;
3318 reload_regions; 3391 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3392 reload_treasures;
3323 3393
3324 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
3325} 3395}
3326 3396
3327sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
3328 reload_resources; 3400 reload_resources;
3329} 3401}
3330 3402
3331sub reload_config { 3403sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3430 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
3360 }; 3432 };
3361 3433
3434 {
3435 my $guard = freeze_mainloop;
3362 reload_config; 3436 reload_config;
3363 db_init; 3437 db_init;
3364 load_extensions; 3438 load_extensions;
3365 3439
3366 $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
3367 evthread_start IO::AIO::poll_fileno; 3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
3368 EV::loop; 3444 EV::loop;
3369} 3445}
3370 3446
3371############################################################################# 3447#############################################################################
3372# initialisation and cleanup 3448# initialisation and cleanup
… …
3379 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
3380 }; 3456 };
3381 } 3457 }
3382} 3458}
3383 3459
3384sub write_runtime { 3460sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
3386 3462
3387 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
3389 3465
… …
3415 and return; 3491 and return;
3416 3492
3417 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
3418 3494
3419 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 };
3420} 3539}
3421 3540
3422sub emergency_save() { 3541sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3424 3543
… …
3446 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
3447 3566
3448 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
3450 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";
3451 }; 3574 };
3452 3575
3453 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
3454} 3577}
3455 3578
… …
3470 warn "reloading..."; 3593 warn "reloading...";
3471 3594
3472 warn "entering sync_job"; 3595 warn "entering sync_job";
3473 3596
3474 cf::sync_job { 3597 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3599 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3478 3601
3479 warn "syncing database to disk"; 3602 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3604
3482 # 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
… …
3607 3730
3608our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3610 3733
3611sub wait_for_tick { 3734sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3736
3615 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3739 $signal->wait;
3618} 3740}
3619 3741
3620sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3744
3624 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3747 $signal->wait;
3627} 3748}
… …
3637 3758
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $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.;
3640 Coro::async_pool { 3761 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3762 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3763 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3764 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3765 };
3645 } 3766 }
3646 3767
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {

Diff Legend

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