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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.528 by root, Fri Apr 23 04:42:12 2010 UTC

… …
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE;
112 112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
118
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
117 123
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
258$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
260 270
261 warn Carp::longmess $_[0]; 271 warn Carp::longmess $_[0];
262 272
263 if ($Coro::current == $Coro::main) {#d# 273 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 275 return;#d#
266 }#d# 276 }#d#
267 277
268 # kill coroutine otherwise 278 # kill coroutine otherwise
… …
396} 406}
397 407
398=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
399 409
400Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 411get spread over time.
402 412
403=cut 413=cut
404 414
405sub periodic($$) { 415sub periodic($$) {
406 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
584 reset_signals; 594 reset_signals;
585 &$cb 595 &$cb
586 }, @args; 596 }, @args;
587 597
588 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
589} 610}
590 611
591=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
592 613
593=cut 614=cut
… …
1174 1195
1175 sync_job { 1196 sync_job {
1176 if (length $$rdata) { 1197 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1180 1202
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
… …
1241 $av = $st->{objs}; 1263 $av = $st->{objs};
1242 } 1264 }
1243 1265
1244 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1247 1270
1248 ($data, $av) 1271 ($data, $av)
1249} 1272}
1250 1273
1251=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1422 if (length $@) { 1445 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1446 warn "$v->{path}: $@\n";
1424 1447
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1449 if exists $v->{meta}{mandatory};
1450
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1427 } else { 1453 } else {
1428 $done{$k} = delete $todo{$k}; 1454 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1455 push @EXTS, $v->{pkg};
1430 $progress = 1; 1456 $progress = 1;
1431 1457
… …
1674 \@logins 1700 \@logins
1675} 1701}
1676 1702
1677=item $player->maps 1703=item $player->maps
1678 1704
1705=item cf::player::maps $login
1706
1679Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1680player. May block. 1708player. May block.
1681 1709
1682=cut 1710=cut
1683 1711
… …
1744 1772
1745=cut 1773=cut
1746 1774
1747sub find_by_path($) { 1775sub find_by_path($) {
1748 my ($path) = @_; 1776 my ($path) = @_;
1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1749 1779
1750 my ($match, $specificity); 1780 my ($match, $specificity);
1751 1781
1752 for my $region (list) { 1782 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
… …
1817 1847
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1849}
1820 1850
1821# also paths starting with '/' 1851# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1853
1824sub thawer_merge { 1854sub thawer_merge {
1825 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1826 1856
1827 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
… …
2137 or next; 2167 or next;
2138 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2139 or next; 2169 or next;
2140 $neigh->load; 2170 $neigh->load;
2141 2171
2172 # now find the diagonal neighbours
2142 push @neigh, 2173 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2176 }
2146 2177
… …
2198 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2199 2230
2200 () 2231 ()
2201} 2232}
2202 2233
2234# common code, used by both ->save and ->swapout
2203sub save { 2235sub _save {
2204 my ($self) = @_; 2236 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2237
2208 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2209 2239
2210 return unless $self->dirty; 2240 return unless $self->dirty;
2211 2241
… …
2231 } else { 2261 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2263 }
2234} 2264}
2235 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2236sub swap_out { 2274sub swap_out {
2237 my ($self) = @_; 2275 my ($self) = @_;
2238 2276
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2278
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2247 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2249 2333
2250 $self->deactivate; 2334 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2336 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2337
2298 $self->unlink_save; 2338 $self->unlink_save;
2299 $self->destroy; 2339 $self->destroy;
2300} 2340}
2301 2341
… …
2309 2349
2310 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2311 2351
2312 $self->unlink_save; 2352 $self->unlink_save;
2313 2353
2314 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2359
… …
2549 2589
2550Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2551 2591
2552The player should be reasonably safe there for short amounts of time (e.g. 2592The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2594though, as the player cannot control the character while it is on the link
2555map. 2595map.
2556 2596
2557Will never block. 2597Will never block.
2558 2598
2559=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2581 my ($self) = @_; 2621 my ($self) = @_;
2582 2622
2583 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2584 2624
2625 ++$self->{_link_recursion};
2626
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2628
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2589 2631
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2633}
2592 2634
2593sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2595 2637
… …
2620 $map->load_neighbours; 2662 $map->load_neighbours;
2621 2663
2622 return unless $self->contr->active; 2664 return unless $self->contr->active;
2623 2665
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2626 2668 # entering was successful
2669 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2670 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2671 $self->activate_recursive;
2629} 2672 }
2630 2673
2674}
2675
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2677
2633Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2680that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2681the new (success) or old (failed) map position. In either case, $done will
… …
2643 2688
2644our $GOTOGEN; 2689our $GOTOGEN;
2645 2690
2646sub cf::object::player::goto { 2691sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2648 2699
2649 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2702
2652 $self->enter_link; 2703 $self->enter_link;
… …
2676 my $map = eval { 2727 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2678 2729
2679 if ($map) { 2730 if ($map) {
2680 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2733 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2735 }
2685 2736
2686 $map 2737 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2697 } 2748 }
2698 2749
2699 $done->() if $done; 2750 $done->($self) if $done;
2700 })->prio (1); 2751 })->prio (1);
2701} 2752}
2702 2753
2703=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2704 2755
… …
3477 or return; 3528 or return;
3478 3529
3479 local $/; 3530 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3481 3532
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3534
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3537
3487 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
… …
3528 3579
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3584
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3586
3541 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
… …
3548 }; 3594 };
3549 3595
3550 evthread_start IO::AIO::poll_fileno; 3596 evthread_start IO::AIO::poll_fileno;
3551 3597
3552 cf::sync_job { 3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3553 cf::load_settings; 3604 cf::load_settings;
3554 cf::load_materials; 3605 cf::load_materials;
3555 3606
3556 reload_resources; 3607 reload_resources;
3557 reload_config; 3608 reload_config;
… …
3573 use POSIX (); 3624 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3626
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3627 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 3628 };
3629
3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3578 3632
3579 main_loop; 3633 main_loop;
3580} 3634}
3581 3635
3582############################################################################# 3636#############################################################################
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3817 }
3764 warn "cleared package $pkg\n";#d#
3765} 3818}
3766 3819
3767sub do_reload_perl() { 3820sub do_reload_perl() {
3768 # can/must only be called in main 3821 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3770 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3771 return; 3824 return;
3772 } 3825 }
3773 3826
3774 return if $RELOAD++; 3827 return if $RELOAD++;

Diff Legend

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