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.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.303 by root, Wed Jul 11 15:57:31 2007 UTC

… …
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24 24
25use JSON::XS 1.4 ();
25use BDB (); 26use BDB ();
26use Data::Dumper; 27use Data::Dumper;
27use Digest::MD5; 28use Digest::MD5;
28use Fcntl; 29use Fcntl;
29use YAML::Syck (); 30use YAML::Syck ();
30use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
31use Time::HiRes; 32use Time::HiRes;
32use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
33 35
34# configure various modules to our taste 36# configure various modules to our taste
35# 37#
36$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
… …
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 240 $d
238 } || "[unable to dump $_[0]: '$@']"; 241 } || "[unable to dump $_[0]: '$@']";
239} 242}
240 243
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 244=item $ref = cf::from_json $json
244 245
245Converts a JSON string into the corresponding perl data structure. 246Converts a JSON string into the corresponding perl data structure.
246 247
247=item $json = cf::to_json $ref 248=item $json = cf::to_json $ref
248 249
249Converts a perl data structure into its JSON representation. 250Converts a perl data structure into its JSON representation.
251
252=cut
253
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255
256sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) }
250 258
251=item cf::lock_wait $string 259=item cf::lock_wait $string
252 260
253Wait until the given lock is available. See cf::lock_acquire. 261Wait until the given lock is available. See cf::lock_acquire.
254 262
… …
402Coro::Storable. May, of course, block. Note that the executed sub may 410Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 411never block itself or use any form of Event handling.
404 412
405=cut 413=cut
406 414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423
407sub fork_call(&@) { 424sub fork_call(&@) {
408 my ($cb, @args) = @_; 425 my ($cb, @args) = @_;
409 426
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
411# or die "socketpair: $!"; 428# or die "socketpair: $!";
… …
414 431
415 if (my $pid = fork) { 432 if (my $pid = fork) {
416 close $fh2; 433 close $fh2;
417 434
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
419 $res = Coro::Storable::thaw $res; 437 $res = Coro::Storable::thaw $res;
420 438
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422 440
423 die $$res unless "ARRAY" eq ref $res; 441 Carp::confess $$res unless "ARRAY" eq ref $res;
424 442
425 return wantarray ? @$res : $res->[-1]; 443 return wantarray ? @$res : $res->[-1];
426 } else { 444 } else {
427 reset_signals; 445 reset_signals;
428 local $SIG{__WARN__}; 446 local $SIG{__WARN__};
429 local $SIG{__DIE__}; 447 local $SIG{__DIE__};
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453
430 eval { 454 eval {
431 close $fh1; 455 close $fh1;
432 456
433 my @res = eval { $cb->(@args) }; 457 my @res = eval { $cb->(@args) };
458
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
435 }; 461 };
436 462
437 warn $@ if $@; 463 warn $@ if $@;
438 _exit 0; 464 _exit 0;
439 } 465 }
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1055 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1056}
1031 1057
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1058=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1059
1034Register a callback fro execution when the client sends an extcmd packet. 1060Register a callback for execution when the client sends an (synchronous)
1061extcmd packet. Ext commands will be processed in the order they are
1062received by the server, like other user commands. The first argument is
1063the logged-in player. Ext commands can only be processed after a player
1064has logged in successfully.
1035 1065
1036If the callback returns something, it is sent back as if reply was being 1066If the callback returns something, it is sent back as if reply was being
1037called. 1067called.
1038 1068
1069=item cf::register_exticmd $name => \&callback($ns,$packet);
1070
1071Register a callback for execution when the client sends an (asynchronous)
1072exticmd packet. Exti commands are processed by the server as soon as they
1073are received, i.e. out of order w.r.t. other commands. The first argument
1074is a client socket. Exti commands can be received anytime, even before
1075log-in.
1076
1077If the callback returns something, it is sent back as if reply was being
1078called.
1079
1039=cut 1080=cut
1040 1081
1041sub register_extcmd { 1082sub register_extcmd {
1042 my ($name, $cb) = @_; 1083 my ($name, $cb) = @_;
1043 1084
1044 $EXTCMD{$name} = $cb; 1085 $EXTCMD{$name} = $cb;
1086}
1087
1088sub register_exticmd {
1089 my ($name, $cb) = @_;
1090
1091 $EXTICMD{$name} = $cb;
1045} 1092}
1046 1093
1047cf::player->attach ( 1094cf::player->attach (
1048 on_command => sub { 1095 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1096 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1105 cf::override;
1059 }, 1106 },
1060 on_extcmd => sub { 1107 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1108 my ($pl, $buf) = @_;
1062 1109
1063 my $msg = eval { from_json $buf }; 1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1111
1065 if (ref $msg) { 1112 if (ref $msg) {
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1114 if (my %reply = $cb->($pl, $msg)) {
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1115 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1372 # replace G<male|female> tags 1419 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1420 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1 1421 $self->gender ? $2 : $1
1375 }ge 1422 }ge
1376 # replace H<hint text> 1423 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1378 1431
1379 # create single paragraphs (very hackish) 1432 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1433 s/(?<=\S)\n(?=\w)/ /g;
1381 1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1382 $_ 1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1383} 1447}
1384 1448
1385=item $player->ext_reply ($msgid, %msg) 1449=item $player->ext_reply ($msgid, %msg)
1386 1450
1387Sends an ext reply to the player. 1451Sends an ext reply to the player.
… …
1390 1454
1391sub ext_reply($$%) { 1455sub ext_reply($$%) {
1392 my ($self, $id, %msg) = @_; 1456 my ($self, $id, %msg) = @_;
1393 1457
1394 $msg{msgid} = $id; 1458 $msg{msgid} = $id;
1395 1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1460}
1398 1461
1399=item $player->ext_event ($type, %msg) 1462=item $player->ext_event ($type, %msg)
1400 1463
1401Sends an ext event to the client. 1464Sends an ext event to the client.
… …
2313 my $hp = $exit->stats->hp; 2376 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2377 my $sp = $exit->stats->sp;
2315 2378
2316 $self->enter_link; 2379 $self->enter_link;
2317 2380
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2318 (async { 2385 (async {
2319 $self->deactivate_recursive; # just to be sure 2386 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2387 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2388 $self->goto ($slaying, $hp, $sp);
2322 2389
… …
2363sub cf::client::send_msg { 2430sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2431 my ($self, $color, $type, $msg, @extra) = @_;
2365 2432
2366 $msg = $self->pl->expand_cfpod ($msg); 2433 $msg = $self->pl->expand_cfpod ($msg);
2367 2434
2435 return unless @extra || length $msg;
2436
2368 if ($self->can_msg) { 2437 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2370 } else { 2439 } else {
2371 # replace some tags by gcfclient-compatible ones 2440 # replace some tags by gcfclient-compatible ones
2372 for ($msg) { 2441 for ($msg) {
2373 1 while 2442 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ 2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ 2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ 2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/; 2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 } 2448 }
2380 2449
2381 if ($color >= 0) { 2450 if ($color >= 0) {
2382 if ($msg =~ /\[/) { 2451 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2452 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else { 2453 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385 $self->send_packet ("drawinfo $color $msg") 2455 $self->send_packet ("drawinfo $color $msg")
2386 } 2456 }
2387 } 2457 }
2388 } 2458 }
2389} 2459}
2390 2460
2391=item $client->ext_event ($type, %msg) 2461=item $client->ext_event ($type, %msg)
2392 2462
2393Sends an exti event to the client. 2463Sends an ext event to the client.
2394 2464
2395=cut 2465=cut
2396 2466
2397sub cf::client::ext_event($$%) { 2467sub cf::client::ext_event($$%) {
2398 my ($self, $type, %msg) = @_; 2468 my ($self, $type, %msg) = @_;
2399 2469
2400 $msg{msgtype} = "event_$type"; 2470 $msg{msgtype} = "event_$type";
2401 $self->send_packet ("ext " . cf::to_json \%msg); 2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2402} 2472}
2403 2473
2404=item $success = $client->query ($flags, "text", \&cb) 2474=item $success = $client->query ($flags, "text", \&cb)
2405 2475
2406Queues a query to the client, calling the given callback with 2476Queues a query to the client, calling the given callback with
2407the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2477the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2478C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409 2479
2410Queries can fail, so check the return code. Or don't, as queries will become 2480Queries can fail, so check the return code. Or don't, as queries will
2411reliable at some point in the future. 2481become reliable at some point in the future.
2412 2482
2413=cut 2483=cut
2414 2484
2415sub cf::client::query { 2485sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 2486 my ($self, $flags, $text, $cb) = @_;
… …
2424 utf8::encode $text; 2494 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2495 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 2496
2427 $self->send_packet ($self->{query_queue}[0][0]) 2497 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 2498 if @{ $self->{query_queue} } == 1;
2499
2500 1
2429} 2501}
2430 2502
2431cf::client->attach ( 2503cf::client->attach (
2504 on_connect => sub {
2505 my ($ns) = @_;
2506
2507 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2508 },
2432 on_reply => sub { 2509 on_reply => sub {
2433 my ($ns, $msg) = @_; 2510 my ($ns, $msg) = @_;
2434 2511
2435 # this weird shuffling is so that direct followup queries 2512 # this weird shuffling is so that direct followup queries
2436 # get handled first 2513 # get handled first
… …
2448 } else { 2525 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2526 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 2527 }
2451 } 2528 }
2452 }, 2529 },
2530 on_exticmd => sub {
2531 my ($ns, $buf) = @_;
2532
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534
2535 if (ref $msg) {
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2537 if (my %reply = $cb->($ns, $msg)) {
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 }
2542 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 }
2545
2546 cf::override;
2547 },
2453); 2548);
2454 2549
2455=item $client->async (\&cb) 2550=item $client->async (\&cb)
2456 2551
2457Create a new coroutine, running the specified callback. The coroutine will 2552Create a new coroutine, running the specified callback. The coroutine will
… …
2506 2601
2507=pod 2602=pod
2508 2603
2509The following functions and methods are available within a safe environment: 2604The following functions and methods are available within a safe environment:
2510 2605
2511 cf::object contr pay_amount pay_player map 2606 cf::object
2607 contr pay_amount pay_player map x y force_find force_add
2608 insert remove
2609
2512 cf::object::player player 2610 cf::object::player
2513 cf::player peaceful 2611 player
2514 cf::map trigger 2612
2613 cf::player
2614 peaceful
2615
2616 cf::map
2617 trigger
2515 2618
2516=cut 2619=cut
2517 2620
2518for ( 2621for (
2519 ["cf::object" => qw(contr pay_amount pay_player map)], 2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)],
2520 ["cf::object::player" => qw(player)], 2624 ["cf::object::player" => qw(player)],
2521 ["cf::player" => qw(peaceful)], 2625 ["cf::player" => qw(peaceful)],
2522 ["cf::map" => qw(trigger)], 2626 ["cf::map" => qw(trigger)],
2523) { 2627) {
2524 no strict 'refs'; 2628 no strict 'refs';
… …
2616 { 2720 {
2617 my $faces = $facedata->{faceinfo}; 2721 my $faces = $facedata->{faceinfo};
2618 2722
2619 while (my ($face, $info) = each %$faces) { 2723 while (my ($face, $info) = each %$faces) {
2620 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2724 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2621 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2725 cf::face::set_visibility $idx, $info->{visibility};
2726 cf::face::set_magicmap $idx, $info->{magicmap};
2622 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2727 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2623 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2728 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2624 Coro::cede; 2729
2730 cf::cede_to_tick;
2625 } 2731 }
2626 2732
2627 while (my ($face, $info) = each %$faces) { 2733 while (my ($face, $info) = each %$faces) {
2628 next unless $info->{smooth}; 2734 next unless $info->{smooth};
2629 my $idx = cf::face::find $face 2735 my $idx = cf::face::find $face
2630 or next; 2736 or next;
2631 if (my $smooth = cf::face::find $info->{smooth}) { 2737 if (my $smooth = cf::face::find $info->{smooth}) {
2738 cf::face::set_smooth $idx, $smooth;
2632 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2739 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633 } else { 2740 } else {
2634 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2741 warn "smooth face '$info->{smooth}' not found for face '$face'";
2635 } 2742 }
2636 Coro::cede; 2743
2744 cf::cede_to_tick;
2637 } 2745 }
2638 } 2746 }
2639 2747
2640 { 2748 {
2641 my $anims = $facedata->{animinfo}; 2749 my $anims = $facedata->{animinfo};
2642 2750
2643 while (my ($anim, $info) = each %$anims) { 2751 while (my ($anim, $info) = each %$anims) {
2644 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2752 cf::anim::set $anim, $info->{frames}, $info->{facings};
2645 Coro::cede; 2753 cf::cede_to_tick;
2646 } 2754 }
2647 2755
2648 cf::anim::invalidate_all; # d'oh 2756 cf::anim::invalidate_all; # d'oh
2757 }
2758
2759 {
2760 # TODO: for gcfclient pleasure, we should give resources
2761 # that gcfclient doesn't grok a >10000 face index.
2762 my $res = $facedata->{resource};
2763 my $enc = JSON::XS->new->utf8->canonical;
2764
2765 while (my ($name, $info) = each %$res) {
2766 my $meta = $enc->encode ({
2767 name => $name,
2768 type => $info->{type},
2769 copyright => $info->{copyright}, #TODO#
2770 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2775 cf::face::set_type $idx, 1;
2776 cf::face::set_data $idx, 0, $data, $chk;
2777
2778 cf::cede_to_tick;
2779 }
2649 } 2780 }
2650 2781
2651 1 2782 1
2652} 2783}
2653 2784
… …
2660 load_facedata "$DATADIR/facedata" 2791 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 2792 or die "unable to load facedata\n";
2662} 2793}
2663 2794
2664sub reload_archetypes { 2795sub reload_archetypes {
2796 load_resource_file "$DATADIR/archetypes"
2797 or die "unable to load archetypes\n";
2798 #d# NEED to laod twice to resolve forward references
2799 # this really needs to be done in an extra post-pass
2800 # (which needs to be synchronous, so solve it differently)
2665 load_resource_file "$DATADIR/archetypes" 2801 load_resource_file "$DATADIR/archetypes"
2666 or die "unable to load archetypes\n"; 2802 or die "unable to load archetypes\n";
2667} 2803}
2668 2804
2669sub reload_treasures { 2805sub reload_treasures {
… …
2863 %EXT_CORO = (); 2999 %EXT_CORO = ();
2864 3000
2865 warn "removing commands"; 3001 warn "removing commands";
2866 %COMMAND = (); 3002 %COMMAND = ();
2867 3003
2868 warn "removing ext commands"; 3004 warn "removing ext/exti commands";
2869 %EXTCMD = (); 3005 %EXTCMD = ();
3006 %EXTICMD = ();
2870 3007
2871 warn "unloading/nuking all extensions"; 3008 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) { 3009 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg"; 3010 warn "... unloading $pkg";
2874 3011

Diff Legend

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