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.438 by elmex, Sun Jul 13 20:15:51 2008 UTC vs.
Revision 1.458 by root, Sat Dec 13 20:34:37 2008 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
43use Coro::AnyEvent; 46use Coro::AnyEvent;
… …
61 64
62# configure various modules to our taste 65# configure various modules to our taste
63# 66#
64$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
69 75
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 77
72our %COMMAND = (); 78our %COMMAND = ();
73our %COMMAND_TIME = (); 79our %COMMAND_TIME = ();
… …
76our %EXTCMD = (); 82our %EXTCMD = ();
77our %EXTICMD = (); 83our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 84our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 85our %EXT_MAP = (); # pluggable maps
80 86
81our $RELOAD; # number of reloads so far 87our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 88our @EVENT;
83 89
84our $CONFDIR = confdir; 90our $CONFDIR = confdir;
85our $DATADIR = datadir; 91our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 92our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 93our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 94our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 95our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 96our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 97our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 98our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 99our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 100our $BDBDIR = "$LOCALDIR/db";
101our $PIDFILE = "$LOCALDIR/pid";
102our $RUNTIMEFILE = "$LOCALDIR/runtime";
103
95our %RESOURCE; 104our %RESOURCE;
96 105
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 108our $NEXT_TICK;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 129our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 130our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 131our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 132our $TICK_START; # for load detecting purposes
124 133
134our @POST_INIT;
135
136our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
137
125binmode STDOUT; 138binmode STDOUT;
126binmode STDERR; 139binmode STDERR;
127 140
128# read virtual server time, if available 141# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 142unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 143 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 144 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 145 $RUNTIME = <$fh> + 0.;
133} 146}
134 147
135mkdir $_ 148mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
243for my $pkg (qw( 256for my $pkg (qw(
244 cf::global cf::attachable 257 cf::global cf::attachable
245 cf::object cf::object::player 258 cf::object cf::object::player
246 cf::client cf::player 259 cf::client cf::player
247 cf::arch cf::living 260 cf::arch cf::living
261 cf::map cf::mapspace
248 cf::map cf::party cf::region 262 cf::party cf::region
249)) { 263)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 264 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 265}
253 266
254$EV::DIED = sub { 267$EV::DIED = sub {
255 warn "error in event callback: @_"; 268 warn "error in event callback: @_";
… …
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 310our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 311
299sub encode_json($) { $json_coder->encode ($_[0]) } 312sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 313sub decode_json($) { $json_coder->decode ($_[0]) }
301 314
315=item cf::post_init { BLOCK }
316
317Execute the given codeblock, I<after> all extensions have been (re-)loaded,
318but I<before> the server starts ticking again.
319
320The cdoeblock will have a single boolean argument to indicate whether this
321is a reload or not.
322
323=cut
324
325sub post_init(&) {
326 push @POST_INIT, shift;
327}
328
302=item cf::lock_wait $string 329=item cf::lock_wait $string
303 330
304Wait until the given lock is available. See cf::lock_acquire. 331Wait until the given lock is available. See cf::lock_acquire.
305 332
306=item my $lock = cf::lock_acquire $string 333=item my $lock = cf::lock_acquire $string
307 334
308Wait until the given lock is available and then acquires it and returns 335Wait until the given lock is available and then acquires it and returns
309a Coro::guard object. If the guard object gets destroyed (goes out of scope, 336a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 337for example when the coroutine gets canceled), the lock is automatically
311returned. 338returned.
312 339
313Locks are *not* recursive, locking from the same coro twice results in a 340Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 341deadlocked coro.
… …
333 return;#d# 360 return;#d#
334 }#d# 361 }#d#
335 362
336 # wait for lock, if any 363 # wait for lock, if any
337 while ($LOCK{$key}) { 364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
338 push @{ $LOCK{$key} }, $Coro::current; 366 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule; 367 Coro::schedule;
340 } 368 }
341} 369}
342 370
… …
347 lock_wait $key; 375 lock_wait $key;
348 376
349 $LOCK{$key} = []; 377 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d# 378 $LOCKER{$key} = $Coro::current;#d#
351 379
352 Coro::guard { 380 Guard::guard {
353 delete $LOCKER{$key};#d# 381 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side 382 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} }; 383 $_->ready for @{ delete $LOCK{$key} };
356 } 384 }
357} 385}
… …
363} 391}
364 392
365sub freeze_mainloop { 393sub freeze_mainloop {
366 tick_inhibit_inc; 394 tick_inhibit_inc;
367 395
368 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
369} 397}
370 398
371=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
372 400
373Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
… …
725 753
726############################################################################# 754#############################################################################
727 755
728=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
729 757
730Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
733 761
734In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
785=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
786 814
787Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
789 817
790Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
792 820
793These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
794 822
795=over 4 823=over 4
… …
1086 1114
1087sub reattach { 1115sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1117 my ($obj) = @_;
1090 1118
1119 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1121
1093 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1094 1123
1095 @$registry = (); 1124 @$registry = ();
1096 1125
… …
1161 } else { 1190 } else {
1162 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1163 } 1192 }
1164 1193
1165 aio_rename "$filename~", $filename; 1194 aio_rename "$filename~", $filename;
1195
1196 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1198 } else {
1167 warn "FATAL: $filename~: $!\n"; 1199 warn "FATAL: $filename~: $!\n";
1168 } 1200 }
1169 } else { 1201 } else {
1170 aio_unlink $filename; 1202 aio_unlink $filename;
… …
1263 my ($name, $cb) = @_; 1295 my ($name, $cb) = @_;
1264 1296
1265 $EXTICMD{$name} = $cb; 1297 $EXTICMD{$name} = $cb;
1266} 1298}
1267 1299
1300use File::Glob ();
1301
1268cf::player->attach ( 1302cf::player->attach (
1269 on_command => sub { 1303 on_command => sub {
1270 my ($pl, $name, $params) = @_; 1304 my ($pl, $name, $params) = @_;
1271 1305
1272 my $cb = $COMMAND{$name} 1306 my $cb = $COMMAND{$name}
… …
1304 1338
1305 cf::override; 1339 cf::override;
1306 }, 1340 },
1307); 1341);
1308 1342
1343# "readahead" all extensions
1344sub cache_extensions {
1345 my $grp = IO::AIO::aio_group;
1346
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1348 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 }
1351 };
1352
1353 $grp
1354}
1355
1309sub load_extensions { 1356sub load_extensions {
1310 cf::sync_job { 1357 cf::sync_job {
1311 my %todo; 1358 my %todo;
1312 1359
1313 for my $path (<$LIBDIR/*.ext>) { 1360 for my $path (<$LIBDIR/*.ext>) {
… …
1332 1379
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1380 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1381 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1382
1336 $ext{source} = 1383 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1384 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1385 . "#line 1 \"$path\"\n{\n"
1339 . $source 1386 . $source
1340 . "\n};\n1"; 1387 . "\n};\n1";
1341 1388
1342 $todo{$base} = \%ext; 1389 $todo{$base} = \%ext;
… …
1382 1429
1383=back 1430=back
1384 1431
1385=head2 CORE EXTENSIONS 1432=head2 CORE EXTENSIONS
1386 1433
1387Functions and methods that extend core crossfire objects. 1434Functions and methods that extend core deliantra objects.
1388 1435
1389=cut 1436=cut
1390 1437
1391package cf::player; 1438package cf::player;
1392 1439
… …
1435 1482
1436sub exists($) { 1483sub exists($) {
1437 my ($login) = @_; 1484 my ($login) = @_;
1438 1485
1439 $cf::PLAYER{$login} 1486 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1487 or !aio_stat path $login
1441} 1488}
1442 1489
1443sub find($) { 1490sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1491 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1492 my $login = $_[0];
… …
1520 my ($pl) = @_; 1567 my ($pl) = @_;
1521 1568
1522 my $name = $pl->ob->name; 1569 my $name = $pl->ob->name;
1523 1570
1524 $pl->{deny_save} = 1; 1571 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1572 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1573
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1574 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1575 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1576 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1577 $pl->ob->check_score;
… …
1616 } 1663 }
1617 1664
1618 \@paths 1665 \@paths
1619} 1666}
1620 1667
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1668=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1669
1623Expand crossfire pod fragments into protocol xml. 1670Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1671
1714=item $player->ext_reply ($msgid, @msg) 1672=item $player->ext_reply ($msgid, @msg)
1715 1673
1716Sends an ext reply to the player. 1674Sends an ext reply to the player.
1717 1675
… …
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2044 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2045 $f->skip_block;
2088 $self->_load_objects ($f) 2046 $self->_load_objects ($f)
2089 or return; 2047 or return;
2090 2048
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
2092 if delete $self->{load_original}; 2050 if delete $self->{load_original};
2093 2051
2094 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2053 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2054 unless (aio_stat $uniq) {
… …
2531 2489
2532=item $player_object->enter_link 2490=item $player_object->enter_link
2533 2491
2534Freezes the player and moves him/her to a special map (C<{link}>). 2492Freezes the player and moves him/her to a special map (C<{link}>).
2535 2493
2536The player should be reasonably safe there for short amounts of time. You 2494The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2495for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2496though, as the palyer cannot control the character while it is on the link
2497map.
2538 2498
2539Will never block. 2499Will never block.
2540 2500
2541=item $player_object->leave_link ($map, $x, $y) 2501=item $player_object->leave_link ($map, $x, $y)
2542 2502
… …
2600 2560
2601 $map->load; 2561 $map->load;
2602 $map->load_neighbours; 2562 $map->load_neighbours;
2603 2563
2604 return unless $self->contr->active; 2564 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2605 $self->activate_recursive; 2566 $self->activate_recursive;
2606 2567
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2569 $self->enter_map ($map, $x, $y);
2609} 2570}
… …
2772 $self->contr->savebed ($map, $x, $y) 2733 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2734 if $exit->flag (cf::FLAG_DAMNED);
2774 2735
2775 1 2736 1
2776 }) { 2737 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2738 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2739 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2740 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2741 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2742
2782 warn "ERROR in enter_exit: $@"; 2743 warn "ERROR in enter_exit: $@";
… …
2848 id => "infobox", 2809 id => "infobox",
2849 title => "Body Parts", 2810 title => "Body Parts",
2850 reply => undef, 2811 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2812 tooltip => "Shows which body parts you posess and are available",
2852 }, 2813 },
2814 "c/skills" => {
2815 id => "infobox",
2816 title => "Skills",
2817 reply => undef,
2818 tooltip => "Shows your experience per skill and item power",
2819 },
2853 "c/uptime" => { 2820 "c/uptime" => {
2854 id => "infobox", 2821 id => "infobox",
2855 title => "Uptime", 2822 title => "Uptime",
2856 reply => undef, 2823 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2824 tooltip => "How long the server has been running since last restart",
… …
2871); 2838);
2872 2839
2873sub cf::client::send_msg { 2840sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2841 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2842
2876 $msg = $self->pl->expand_cfpod ($msg); 2843 $msg = $self->pl->expand_cfpod ($msg)
2844 unless $color & cf::NDI_VERBATIM;
2877 2845
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2846 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2847
2880 # check predefined channels, for the benefit of C 2848 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2849 if ($CHANNEL{$channel}) {
… …
2902 if ($self->can_msg) { 2870 if ($self->can_msg) {
2903 # default colour, mask it out 2871 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 2873 if $color & cf::NDI_DEF;
2906 2874
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2875 my $pkt = "msg "
2876 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 );
2879
2880 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf};
2883
2884 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag";
2888 }
2889
2890 $self->send_packet ($pkt);
2909 } else { 2891 } else {
2910 if ($color >= 0) { 2892 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones 2893 # replace some tags by gcfclient-compatible ones
2912 for ($msg) { 2894 for ($msg) {
2913 1 while 2895 1 while
… …
3396 reload_treasures; 3378 reload_treasures;
3397 3379
3398 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
3399} 3381}
3400 3382
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407}
3408
3409sub reload_config { 3383sub reload_config {
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3385 or return;
3412 3386
3413 local $/; 3387 local $/;
… …
3425 }; 3399 };
3426 warn $@ if $@; 3400 warn $@ if $@;
3427 } 3401 }
3428} 3402}
3429 3403
3404sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!";
3407 flock $fh, &Fcntl::LOCK_EX
3408 or die "$PIDFILE: flock: $!";
3409 $fh
3410}
3411
3412# make sure only one server instance is running at any one time
3413sub atomic {
3414 my $fh = pidfile;
3415
3416 my $pid = <$fh>;
3417 kill 9, $pid if $pid > 0;
3418
3419 seek $fh, 0, 0;
3420 print $fh $$;
3421}
3422
3430sub main { 3423sub main {
3424 cf::init_globals; # initialise logging
3425
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3428 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3429 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3430
3431 cf::init_experience;
3432 cf::init_anim;
3433 cf::init_attackmess;
3434 cf::init_dynamic;
3435 cf::init_block;
3436
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438
3431 # we must not ever block the main coroutine 3439 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3440 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3441 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3442 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3443 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3444 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3445 })->prio (Coro::PRIO_MAX);
3438 }; 3446 };
3439 3447
3440 { 3448 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3449
3450 cf::sync_job {
3451 reload_resources;
3442 reload_config; 3452 reload_config;
3443 db_init; 3453 db_init;
3454
3455 cf::load_settings;
3456 cf::load_materials;
3457 cf::init_uuid;
3458 cf::init_signals;
3459 cf::init_commands;
3460 cf::init_skills;
3461
3462 cf::init_beforeplay;
3463
3464 atomic;
3465
3444 load_extensions; 3466 load_extensions;
3445 3467
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3468 utime time, time, $RUNTIMEFILE;
3469
3470 # no (long-running) fork's whatsoever before this point(!)
3471 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3472
3473 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3474 };
3448 3475
3449 EV::loop; 3476 EV::loop;
3450} 3477}
3451 3478
3452############################################################################# 3479#############################################################################
… …
3461 }; 3488 };
3462 } 3489 }
3463} 3490}
3464 3491
3465sub write_runtime_sync { 3492sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime";
3467
3468 # first touch the runtime file to show we are still running: 3493 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3494 # the fsync below can take a very very long time.
3470 3495
3471 IO::AIO::aio_utime $runtime, undef, undef; 3496 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3497
3473 my $guard = cf::lock_acquire "write_runtime"; 3498 my $guard = cf::lock_acquire "write_runtime";
3474 3499
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3476 or return; 3501 or return;
3477 3502
3478 my $value = $cf::RUNTIME + 90 + 10; 3503 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3504 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3505 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3515 aio_utime $fh, undef, undef;
3491 3516
3492 close $fh 3517 close $fh
3493 or return; 3518 or return;
3494 3519
3495 aio_rename "$runtime~", $runtime 3520 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3521 and return;
3497 3522
3498 warn "runtime file written.\n"; 3523 warn "runtime file written.\n";
3499 3524
3500 1 3525 1
… …
3512 my $uuid = "$LOCALDIR/uuid"; 3537 my $uuid = "$LOCALDIR/uuid";
3513 3538
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3539 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3540 or return;
3516 3541
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3542 my $value = uuid_seq uuid_cur;
3543
3544 unless ($value) {
3545 warn "cowardly refusing to write zero uuid value!\n";
3546 return;
3547 }
3548
3549 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3550 $uuid_skip = 0;
3519 3551
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3552 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3553 and return;
3522 3554
… …
3544} 3576}
3545 3577
3546sub emergency_save() { 3578sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3579 my $freeze_guard = cf::freeze_mainloop;
3548 3580
3549 warn "enter emergency perl save\n"; 3581 warn "emergency_perl_save: enter\n";
3550 3582
3551 cf::sync_job { 3583 cf::sync_job {
3584 # this is a trade-off: we want to be very quick here, so
3585 # save all maps without fsync, and later call a global sync
3586 # (which in turn might be very very slow)
3587 local $USE_FSYNC = 0;
3588
3552 # use a peculiar iteration method to avoid tripping on perl 3589 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3590 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3591 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3592 warn "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3593 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3594 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3595 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3596 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3597 $pl->save;
3561 } 3598 }
3562 warn "end emergency player save\n"; 3599 warn "emergency_perl_save: end player save\n";
3563 3600
3564 warn "begin emergency map save\n"; 3601 warn "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3602 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3603 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3604 $map->valid or next;
3568 $map->save; 3605 $map->save;
3569 } 3606 }
3570 warn "end emergency map save\n"; 3607 warn "emergency_perl_save: end map save\n";
3571 3608
3572 warn "begin emergency database checkpoint\n"; 3609 warn "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3611 warn "emergency_perl_save: end database checkpoint\n";
3575 3612
3576 warn "begin write uuid\n"; 3613 warn "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3614 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3615 warn "emergency_perl_save: end write uuid\n";
3579 }; 3616 };
3580 3617
3618 warn "emergency_perl_save: starting sync()\n";
3619 IO::AIO::aio_sync sub {
3620 warn "emergency_perl_save: finished sync()\n";
3621 };
3622
3581 warn "leave emergency perl save\n"; 3623 warn "emergency_perl_save: leave\n";
3582} 3624}
3583 3625
3584sub post_cleanup { 3626sub post_cleanup {
3585 my ($make_core) = @_; 3627 my ($make_core) = @_;
3586 3628
3587 warn Carp::longmess "post_cleanup backtrace" 3629 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3630 if $make_core;
3631
3632 my $fh = pidfile;
3633 unlink $PIDFILE if <$fh> == $$;
3634}
3635
3636# a safer delete_package, copied from Symbol
3637sub clear_package($) {
3638 my $pkg = shift;
3639
3640 # expand to full symbol table name if needed
3641 unless ($pkg =~ /^main::.*::$/) {
3642 $pkg = "main$pkg" if $pkg =~ /^::/;
3643 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3644 $pkg .= '::' unless $pkg =~ /::$/;
3645 }
3646
3647 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3648 my $stem_symtab = *{$stem}{HASH};
3649
3650 defined $stem_symtab and exists $stem_symtab->{$leaf}
3651 or return;
3652
3653 # clear all symbols
3654 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3655 for my $name (keys %$leaf_symtab) {
3656 _gv_clear *{"$pkg$name"};
3657# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3658 }
3659 warn "cleared package $pkg\n";#d#
3589} 3660}
3590 3661
3591sub do_reload_perl() { 3662sub do_reload_perl() {
3592 # can/must only be called in main 3663 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3664 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3665 warn "can only reload from main coroutine";
3595 return; 3666 return;
3596 } 3667 }
3597 3668
3669 return if $RELOAD++;
3670
3671 my $t1 = EV::time;
3672
3673 while ($RELOAD) {
3598 warn "reloading..."; 3674 warn "reloading...";
3599 3675
3600 warn "entering sync_job"; 3676 warn "entering sync_job";
3601 3677
3602 cf::sync_job { 3678 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3679 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3680 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3681 cf::write_runtime_sync; # external watchdog should not bark
3606 3682
3607 warn "syncing database to disk"; 3683 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3684 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3685
3610 # if anything goes wrong in here, we should simply crash as we already saved 3686 # if anything goes wrong in here, we should simply crash as we already saved
3611 3687
3612 warn "flushing outstanding aio requests"; 3688 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs; 3689 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3690 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = ();
3626
3627 warn "removing commands";
3628 %COMMAND = ();
3629
3630 warn "removing ext/exti commands";
3631 %EXTCMD = ();
3632 %EXTICMD = ();
3633
3634 warn "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg";
3637
3638 if (my $cb = $pkg->can ("unload")) {
3639 eval {
3640 $cb->($pkg);
3641 1
3642 } or warn "$pkg unloaded, but with errors: $@";
3643 } 3691 }
3644 3692
3645 warn "... nuking $pkg"; 3693 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3694 $_->cancel for values %EXT_CORO;
3647 } 3695 %EXT_CORO = ();
3648 3696
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3697 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3698 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3699
3700 warn "removing ext/exti commands";
3701 %EXTCMD = ();
3702 %EXTICMD = ();
3703
3704 warn "unloading/nuking all extensions";
3705 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3706 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3707
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3708 if (my $cb = $pkg->can ("unload")) {
3709 eval {
3660 $cb->(); 3710 $cb->($pkg);
3711 1
3712 } or warn "$pkg unloaded, but with errors: $@";
3713 }
3714
3715 warn "... clearing $pkg";
3716 clear_package $pkg;
3661 } 3717 }
3662 3718
3663 Symbol::delete_package $k; 3719 warn "unloading all perl modules loaded from $LIBDIR";
3720 while (my ($k, $v) = each %INC) {
3721 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3722
3723 warn "... unloading $k";
3724 delete $INC{$k};
3725
3726 $k =~ s/\.pm$//;
3727 $k =~ s/\//::/g;
3728
3729 if (my $cb = $k->can ("unload_module")) {
3730 $cb->();
3731 }
3732
3733 clear_package $k;
3664 } 3734 }
3665 3735
3666 warn "getting rid of safe::, as good as possible"; 3736 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3737 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3739
3670 warn "unloading cf.pm \"a bit\""; 3740 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3741 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3742 delete $INC{"cf/pod.pm"};
3673 3743
3674 # don't, removes xs symbols, too, 3744 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3745 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3746 #clear_package __PACKAGE__;
3677 3747
3678 warn "unload completed, starting to reload now"; 3748 warn "unload completed, starting to reload now";
3679 3749
3680 warn "reloading cf.pm"; 3750 warn "reloading cf.pm";
3681 require cf; 3751 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3683 3753
3684 warn "loading config and database again"; 3754 warn "loading config and database again";
3685 cf::reload_config; 3755 cf::reload_config;
3686 3756
3687 warn "loading extensions"; 3757 warn "loading extensions";
3688 cf::load_extensions; 3758 cf::load_extensions;
3689 3759
3760 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3761 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3762 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3763 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3764 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3765 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3766 reattach $_ for values %PLAYER;
3767 }
3696 3768
3769 warn "running post_init jobs";
3770 (pop @POST_INIT)->(1) while @POST_INIT;
3771
3697 warn "leaving sync_job"; 3772 warn "leaving sync_job";
3698 3773
3699 1 3774 1
3700 } or do { 3775 } or do {
3701 warn $@; 3776 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3777 cf::cleanup "error while reloading, exiting.";
3703 }; 3778 };
3704 3779
3705 warn "reloaded"; 3780 warn "reloaded";
3781 --$RELOAD;
3782 }
3783
3784 $t1 = EV::time - $t1;
3785 warn "reload completed in ${t1}s\n";
3706}; 3786};
3707 3787
3708our $RELOAD_WATCHER; # used only during reload 3788our $RELOAD_WATCHER; # used only during reload
3709 3789
3710sub reload_perl() { 3790sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3791 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3792 # coro crashes during coro_state_free->destroy here.
3713 3793
3794 $RELOAD_WATCHER ||= cf::async {
3795 Coro::AIO::aio_wait cache_extensions;
3796
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3797 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3798 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3799 undef $RELOAD_WATCHER;
3800 };
3717 }; 3801 };
3718} 3802}
3719 3803
3720register_command "reload" => sub { 3804register_command "reload" => sub {
3721 my ($who, $arg) = @_; 3805 my ($who, $arg) = @_;
… …
3847 $msg =~ s/\n//; 3931 $msg =~ s/\n//;
3848 3932
3849 # limit the # of concurrent backtraces 3933 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 3934 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 3935 ++$_log_backtrace;
3936 my $perl_bt = Carp::longmess $msg;
3852 async { 3937 async {
3853 $Coro::current->{desc} = "abt $msg"; 3938 $Coro::current->{desc} = "abt $msg";
3854 3939
3855 my @bt = fork_call { 3940 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 3941 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 3952 }
3868 3953
3869 @funcs 3954 @funcs
3870 }; 3955 };
3871 3956
3872 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $perl_bt\n";
3958 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 3959 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 3960 --$_log_backtrace;
3875 }; 3961 };
3876 } else { 3962 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 3963 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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