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.420 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.439 by root, Mon Jul 14 16:42:49 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 1.6;
45use Coro::Storable; 46use Coro::Storable;
46use Coro::Util (); 47use Coro::Util ();
47 48
48use JSON::XS 2.01 (); 49use JSON::XS 2.01 ();
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($;$$) {
432 return if tick_inhibit; 433 return if tick_inhibit || $Coro::current == $Coro::main;
433 434
434 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
435 436
436 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
… …
1141 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1144 1145
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1150 aio_close $fh;
1150 1151
1151 if (@$objs) { 1152 if (@$objs) {
1152 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) {
1153 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1158 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1160 }
1160 } else { 1161 } else {
1161 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1162 } 1163 }
… …
1456 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1458 or return;
1458 1459
1459 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1460 or return; 1461 or return;
1462
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1464 } 1466 }
1465 } 1467 }
… …
1522 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1523 $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
1524 1526
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1529 1533
1530 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1570 1574
1571 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1572 my $path = path $login; 1576 my $path = path $login;
1573 1577
1574 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1584 }
1580 1585
… …
2029 2034
2030 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
2032 2037
2033 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 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";
2036 2041
2037 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
2038 or return; 2043 or return;
2039 2044
2040 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
2043 or return; 2048 or return;
2044 2049
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2048 undef $guard1; 2054 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2055 $map->reset;
2051 return find $path; 2056 return find $path;
2052 } 2057 }
2053 2058
2054 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2087 $f->skip_block;
2083 $self->_load_objects ($f) 2088 $self->_load_objects ($f)
2084 or return; 2089 or return;
2085 2090
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
2087 if delete $self->{load_original}; 2092 if delete $self->{load_original};
2088 2093
2089 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2095 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2096 unless (aio_stat $uniq) {
… …
2457can 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
2458dialogue with the given NPC character. 2463dialogue with the given NPC character.
2459 2464
2460=cut 2465=cut
2461 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
2462# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2482# with dialog boxes.
2464#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
2465sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2478 $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));
2479 2498
2480 } else { 2499 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2502 }
2484 } 2503 }
2485} 2504}
2486 2505
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2594Moves the player to the given map-path and coordinates by first freezing 2613Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2615that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2616the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2617be called at the end of this process.
2618
2619Note that $check will be called with a potentially non-loaded map, so if
2620it needs a loaded map it has to call C<< ->load >>.
2599 2621
2600=cut 2622=cut
2601 2623
2602our $GOTOGEN; 2624our $GOTOGEN;
2603 2625
… …
2682} 2704}
2683 2705
2684sub prepare_random_map { 2706sub prepare_random_map {
2685 my ($exit) = @_; 2707 my ($exit) = @_;
2686 2708
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2711 # that depends on the exit object
2692 2712
2693 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2715 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2700 } 2722 }
2701 2723
2702 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2703 2725
2704 my $data = cf::encode_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2707 2729
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2732 undef $fh;
2711 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2712 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2715 } 2741 }
2716} 2742}
2717 2743
2718sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2720 2746
2721 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2722 2748
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2749 $self->enter_link;
2735 2750
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2751 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2752 $Coro::current->{desc} = "enter_exit";
2742 2753
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2754 unless (eval {
2755 $self->deactivate_recursive; # just to be sure
2756
2757 # random map handling
2758 {
2759 my $guard = cf::lock_acquire "exit_prepare:$exit";
2760
2761 prepare_random_map $exit
2762 if $exit->slaying eq "/!";
2763 }
2764
2765 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2766 my $x = $exit->stats->hp;
2767 my $y = $exit->stats->sp;
2768
2745 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2746 2770
2771 # if exit is damned, update players death & WoR home-position
2772 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED);
2774
2747 1; 2775 1
2748 }) { 2776 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2750 . "I'll try to bring you back to the map you were before. " 2778 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2832 id => "infobox", 2860 id => "infobox",
2833 title => "Map Info", 2861 title => "Map Info",
2834 reply => undef, 2862 reply => undef,
2835 tooltip => "Information related to the maps", 2863 tooltip => "Information related to the maps",
2836 }, 2864 },
2865 "c/party" => {
2866 id => "party",
2867 title => "Party",
2868 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party",
2870 },
2837); 2871);
2838 2872
2839sub cf::client::send_msg { 2873sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2875
… …
3078 3112
3079The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
3080 3114
3081 cf::object 3115 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3116 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3117 insert remove name archname title slaying race decrease split
3084 3118
3085 cf::object::player 3119 cf::object::player
3086 player 3120 player
3087 3121
3088 cf::player 3122 cf::player
… …
3093 3127
3094=cut 3128=cut
3095 3129
3096for ( 3130for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3132 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3133 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
3103) { 3137) {
3104 no strict 'refs'; 3138 no strict 'refs';
… …
3312 while (my ($k, $v) = each %$want) { 3346 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3347 $ns->fx_want ($k, $v);
3314 } 3348 }
3315}; 3349};
3316 3350
3351sub load_resource_file($) {
3352 my $guard = lock_acquire "load_resource_file";
3353
3354 my $status = load_resource_file_ $_[0];
3355 get_slot 0.1, 100;
3356 cf::arch::commit_load;
3357
3358 $status
3359}
3360
3317sub reload_regions { 3361sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3362 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3363 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3365
… …
3334} 3378}
3335 3379
3336sub reload_archetypes { 3380sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3382 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3383}
3345 3384
3346sub reload_treasures { 3385sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
3349} 3388}
3350 3389
3351sub reload_resources { 3390sub reload_resources {
3352 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
3353 3392
3393 reload_facedata;
3394 reload_archetypes;
3354 reload_regions; 3395 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3396 reload_treasures;
3359 3397
3360 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
3361} 3399}
3362 3400
3363sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3364 reload_resources; 3406 reload_resources;
3365} 3407}
3366 3408
3367sub reload_config { 3409sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3436 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3396 }; 3438 };
3397 3439
3440 {
3441 my $guard = freeze_mainloop;
3398 reload_config; 3442 reload_config;
3399 db_init; 3443 db_init;
3400 load_extensions; 3444 load_extensions;
3401 3445
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3447 }
3448
3404 EV::loop; 3449 EV::loop;
3405} 3450}
3406 3451
3407############################################################################# 3452#############################################################################
3408# initialisation and cleanup 3453# initialisation and cleanup
… …
3690 3735
3691our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3693 3738
3694sub wait_for_tick { 3739sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3741
3698 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3744 $signal->wait;
3701} 3745}
3702 3746
3703sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3749
3707 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3752 $signal->wait;
3710} 3753}
… …
3749{ 3792{
3750 # configure BDB 3793 # configure BDB
3751 3794
3752 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3796 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3797 $AnyEvent::BDB::WATCHER->priority (1);
3755 3798
3756 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3802 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3803 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3806
3763 cf::sync_job { 3807 cf::sync_job {
3764 eval { 3808 eval {
… …
3790{ 3834{
3791 # configure IO::AIO 3835 # configure IO::AIO
3792 3836
3793 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3839 undef $AnyEvent::AIO::WATCHER;
3796} 3840}
3797 3841
3798my $_log_backtrace; 3842my $_log_backtrace;
3799 3843
3800sub _log_backtrace { 3844sub _log_backtrace {

Diff Legend

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