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.419 by root, Sun Apr 13 01:34:09 2008 UTC vs.
Revision 1.432 by root, Mon May 5 22:38:47 2008 UTC

… …
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
… …
1139 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1142 1144
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1149 aio_close $fh;
1148 1150
1149 if (@$objs) { 1151 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1157 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1159 }
1158 } else { 1160 } else {
1159 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1160 } 1162 }
… …
1454 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1457 or return;
1456 1458
1457 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1458 or return; 1460 or return;
1461
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1462 } 1465 }
1463 } 1466 }
… …
1473 1476
1474 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1475 1478
1476 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1478 1483
1479 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1485 cf::cede_to_tick;
1481} 1486}
1482 1487
… …
1518 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1519 $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
1520 1525
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1525 1532
1526 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1573
1567 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1568 my $path = path $login; 1575 my $path = path $login;
1569 1576
1570 # a .pst is a dead give-away for a valid player 1577 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1583 }
1576 1584
… …
2025 2033
2026 cf::lock_wait "map_data:$path";#d#remove 2034 cf::lock_wait "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
2028 2036
2029 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 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";
2032 2040
2033 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
2034 or return; 2042 or return;
2035 2043
2036 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
… …
2039 or return; 2047 or return;
2040 2048
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
2044 undef $guard1; 2053 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2054 $map->reset;
2047 return find $path; 2055 return find $path;
2048 } 2056 }
2049 2057
2050 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
… …
2113 } 2121 }
2114 2122
2115 $self->{last_save} = $cf::RUNTIME; 2123 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2124 $self->last_access ($cf::RUNTIME);
2117 2125
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2127 }
2120 2128
2121 $self->post_load; 2129 $self->post_load;
2122} 2130}
2123 2131
… …
2181 my ($path, $origin, $load) = @_; 2189 my ($path, $origin, $load) = @_;
2182 2190
2183 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
2184 2192
2185 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2195 }
2188 2196
2189 $MAP_PREFETCH{$path} |= $load; 2197 $MAP_PREFETCH{$path} |= $load;
2190 2198
2191 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
… …
2228 cf::async { 2236 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2237 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
2231 }; 2239 };
2232 2240
2241 cf::get_slot 0.02;
2242
2233 if ($uniq) { 2243 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2246 } else {
2237 $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);
… …
2245 $self->save; 2255 $self->save;
2246 2256
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2258
2249 return if $self->players; 2259 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2261 return if $self->{deny_save};
2252 2262
2253 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2254 2264
2255 $self->deactivate; 2265 $self->deactivate;
… …
2451can 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
2452dialogue with the given NPC character. 2462dialogue with the given NPC character.
2453 2463
2454=cut 2464=cut
2455 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
2456# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2481# with dialog boxes.
2458#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
2459sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2484 my ($self, $npc, $msg, $flags) = @_;
… …
2471 my $dialog = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2472 $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));
2473 2497
2474 } else { 2498 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2501 }
2478 } 2502 }
2479} 2503}
2480 2504
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2505=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2676} 2700}
2677 2701
2678sub prepare_random_map { 2702sub prepare_random_map {
2679 my ($exit) = @_; 2703 my ($exit) = @_;
2680 2704
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2707 # that depends on the exit object
2686 2708
2687 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
… …
2689 if ($exit->map) { 2711 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2694 } 2718 }
2695 2719
2696 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2697 2721
2698 my $data = cf::encode_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2701 2725
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2728 undef $fh;
2705 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2706 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2709 } 2737 }
2710} 2738}
2711 2739
2712sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2714 2742
2715 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2716 2744
2717 if ($exit->slaying eq "/!") {
2718 #TODO: this should de-fi-ni-te-ly not be a sync-job
2719 # the problem is that $exit might not survive long enough
2720 # so it needs to be done right now, right here
2721 cf::sync_job { prepare_random_map $exit };
2722 }
2723
2724 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2725 my $hp = $exit->stats->hp;
2726 my $sp = $exit->stats->sp;
2727
2728 $self->enter_link; 2745 $self->enter_link;
2729 2746
2730 # if exit is damned, update players death & WoR home-position
2731 $self->contr->savebed ($slaying, $hp, $sp)
2732 if $exit->flag (FLAG_DAMNED);
2733
2734 (async { 2747 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2748 $Coro::current->{desc} = "enter_exit";
2736 2749
2737 $self->deactivate_recursive; # just to be sure
2738 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
2739 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2740 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
2741 1; 2771 1
2742 }) { 2772 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2744 . "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. "
2745 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2826 id => "infobox", 2856 id => "infobox",
2827 title => "Map Info", 2857 title => "Map Info",
2828 reply => undef, 2858 reply => undef,
2829 tooltip => "Information related to the maps", 2859 tooltip => "Information related to the maps",
2830 }, 2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2831); 2867);
2832 2868
2833sub cf::client::send_msg { 2869sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2871
… …
3072 3108
3073The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
3074 3110
3075 cf::object 3111 cf::object
3076 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
3077 insert remove name archname title slaying race decrease_ob_nr 3113 insert remove name archname title slaying race decrease split
3078 3114
3079 cf::object::player 3115 cf::object::player
3080 player 3116 player
3081 3117
3082 cf::player 3118 cf::player
… …
3087 3123
3088=cut 3124=cut
3089 3125
3090for ( 3126for (
3091 ["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
3092 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3129 decrease split destroy)],
3094 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
3096 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3097) { 3133) {
3098 no strict 'refs'; 3134 no strict 'refs';
… …
3306 while (my ($k, $v) = each %$want) { 3342 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3343 $ns->fx_want ($k, $v);
3308 } 3344 }
3309}; 3345};
3310 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
3311sub reload_regions { 3357sub reload_regions {
3312 # 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
3313 # for this (global event?) 3359 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3361
… …
3328} 3374}
3329 3375
3330sub reload_archetypes { 3376sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3378 or die "unable to load archetypes\n";
3333 #d# NEED to laod twice to resolve forward references
3334 # this really needs to be done in an extra post-pass
3335 # (which needs to be synchronous, so solve it differently)
3336 load_resource_file "$DATADIR/archetypes"
3337 or die "unable to load archetypes\n";
3338} 3379}
3339 3380
3340sub reload_treasures { 3381sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
3343} 3384}
3344 3385
3345sub reload_resources { 3386sub reload_resources {
3346 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
3347 3388
3389 reload_facedata;
3390 reload_archetypes;
3348 reload_regions; 3391 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3392 reload_treasures;
3353 3393
3354 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
3355} 3395}
3356 3396
3357sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
3358 reload_resources; 3400 reload_resources;
3359} 3401}
3360 3402
3361sub reload_config { 3403sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3430 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
3390 }; 3432 };
3391 3433
3434 {
3435 my $guard = freeze_mainloop;
3392 reload_config; 3436 reload_config;
3393 db_init; 3437 db_init;
3394 load_extensions; 3438 load_extensions;
3395 3439
3396 $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
3397 evthread_start IO::AIO::poll_fileno; 3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
3398 EV::loop; 3444 EV::loop;
3399} 3445}
3400 3446
3401############################################################################# 3447#############################################################################
3402# initialisation and cleanup 3448# initialisation and cleanup
… …
3684 3730
3685our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3687 3733
3688sub wait_for_tick { 3734sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3691 3736
3692 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3739 $signal->wait;
3695} 3740}
3696 3741
3697sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3700 3744
3701 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3747 $signal->wait;
3704} 3748}

Diff Legend

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