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.434 by root, Thu May 29 03:27:37 2008 UTC vs.
Revision 1.465 by root, Thu Jan 8 00:54:55 2009 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;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
… …
57use Compress::LZF; 61use Compress::LZF;
58use Digest::MD5 (); 62use Digest::MD5 ();
59 63
60AnyEvent::detect; 64AnyEvent::detect;
61 65
62IO::AIO::max_poll_reqs 1;#d#
63
64# configure various modules to our taste 66# configure various modules to our taste
65# 67#
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 76
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 78
74our %COMMAND = (); 79our %COMMAND = ();
75our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 83our %EXTCMD = ();
79our %EXTICMD = (); 84our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
82 87
83our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 89our @EVENT;
85 90
86our $CONFDIR = confdir; 91our $CONFDIR = confdir;
87our $DATADIR = datadir; 92our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
97our %RESOURCE; 105our %RESOURCE;
98 106
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 109our $NEXT_TICK;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 132our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
126 134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
127binmode STDOUT; 139binmode STDOUT;
128binmode STDERR; 140binmode STDERR;
129 141
130# read virtual server time, if available 142# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
135} 147}
136 148
137mkdir $_ 149mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
245for my $pkg (qw( 257for my $pkg (qw(
246 cf::global cf::attachable 258 cf::global cf::attachable
247 cf::object cf::object::player 259 cf::object cf::object::player
248 cf::client cf::player 260 cf::client cf::player
249 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
250 cf::map cf::party cf::region 263 cf::party cf::region
251)) { 264)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 266}
255 267
256$EV::DIED = sub { 268$EV::DIED = sub {
257 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 312
301sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
303 315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
304=item cf::lock_wait $string 330=item cf::lock_wait $string
305 331
306Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
307 333
308=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
309 335
310Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
313returned. 339returned.
314 340
315Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 342deadlocked coro.
… …
322 348
323Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
324 350
325=cut 351=cut
326 352
327our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 354
330sub lock_wait($) { 355sub lock_wait($) {
331 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 357}
344 358
345sub lock_acquire($) { 359sub lock_acquire($) {
346 my ($key) = @_; 360 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 361}
360 362
361sub lock_active($) { 363sub lock_active($) {
362 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 365}
366 366
367sub freeze_mainloop { 367sub freeze_mainloop {
368 tick_inhibit_inc; 368 tick_inhibit_inc;
369 369
370 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
371} 371}
372 372
373=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
374 374
375Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
727 727
728############################################################################# 728#############################################################################
729 729
730=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
731 731
732Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
735 735
736In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
788 788
789Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
791 791
792Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
794 794
795These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
796 796
797=over 4 797=over 4
… …
1088 1088
1089sub reattach { 1089sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1091 my ($obj) = @_;
1092 1092
1093 # no longer needed after getting rid of delete_package?
1093 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1094 1095
1095 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1096 1097
1097 @$registry = (); 1098 @$registry = ();
1098 1099
… …
1163 } else { 1164 } else {
1164 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1165 } 1166 }
1166 1167
1167 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1168 } else { 1172 } else {
1169 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1170 } 1174 }
1171 } else { 1175 } else {
1172 aio_unlink $filename; 1176 aio_unlink $filename;
1173 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1174 } 1178 }
… …
1265 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1266 1270
1267 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1268} 1272}
1269 1273
1274use File::Glob ();
1275
1270cf::player->attach ( 1276cf::player->attach (
1271 on_command => sub { 1277 on_command => sub {
1272 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1273 1279
1274 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1306 1312
1307 cf::override; 1313 cf::override;
1308 }, 1314 },
1309); 1315);
1310 1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1329
1311sub load_extensions { 1330sub load_extensions {
1312 cf::sync_job { 1331 cf::sync_job {
1313 my %todo; 1332 my %todo;
1314 1333
1315 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
… …
1334 1353
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1356
1338 $ext{source} = 1357 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1340 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1341 . $source 1360 . $source
1342 . "\n};\n1"; 1361 . "\n};\n1";
1343 1362
1344 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
… …
1384 1403
1385=back 1404=back
1386 1405
1387=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1388 1407
1389Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1390 1409
1391=cut 1410=cut
1392 1411
1393package cf::player; 1412package cf::player;
1394 1413
… …
1437 1456
1438sub exists($) { 1457sub exists($) {
1439 my ($login) = @_; 1458 my ($login) = @_;
1440 1459
1441 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1443} 1462}
1444 1463
1445sub find($) { 1464sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1466 my $login = $_[0];
… …
1522 my ($pl) = @_; 1541 my ($pl) = @_;
1523 1542
1524 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1525 1544
1526 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1527 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1528 1547
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1530 $pl->deactivate; 1549 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score; 1551 $pl->ob->check_score;
… …
1618 } 1637 }
1619 1638
1620 \@paths 1639 \@paths
1621} 1640}
1622 1641
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1643
1625Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715 1645
1716=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1717 1647
1718Sends an ext reply to the player. 1648Sends an ext reply to the player.
1719 1649
… …
1932 1862
1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1934 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1935} 1865}
1936 1866
1937# and all this just because we cannot iterate over
1938# all maps in C++...
1939sub change_all_map_light {
1940 my ($change) = @_;
1941
1942 $_->change_map_light ($change)
1943 for grep $_->outdoor, values %cf::MAP;
1944}
1945
1946sub decay_objects { 1867sub decay_objects {
1947 my ($self) = @_; 1868 my ($self) = @_;
1948 1869
1949 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1950 1871
… …
2032sub find { 1953sub find {
2033 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
2034 1955
2035 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
2036 1957
2037 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2038 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
2039 1960
2040 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
2044 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2045 or return; 1963 or return;
2046 1964
2047 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
2048 1966
… …
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2007 $f->skip_block;
2090 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2091 or return; 2009 or return;
2092 2010
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2094 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2095 2013
2096 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2015 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
2115 2033
2116 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2117 $self->decay_objects; 2035 $self->decay_objects;
2118 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2119 $self->update_buttons; 2037 $self->update_buttons;
2120 cf::cede_to_tick;
2121 $self->set_darkness_map;
2122 cf::cede_to_tick; 2038 cf::cede_to_tick;
2123 $self->activate; 2039 $self->activate;
2124 } 2040 }
2125 2041
2126 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2533 2449
2534=item $player_object->enter_link 2450=item $player_object->enter_link
2535 2451
2536Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2537 2453
2538The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2539I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2540 2458
2541Will never block. 2459Will never block.
2542 2460
2543=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2544 2462
… …
2602 2520
2603 $map->load; 2521 $map->load;
2604 $map->load_neighbours; 2522 $map->load_neighbours;
2605 2523
2606 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2607 $self->activate_recursive; 2526 $self->activate_recursive;
2608 2527
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2611} 2530}
… …
2615Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2618the new (success) or old (failed) map position. In either case, $done will 2537the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2538be called at the end of this process.
2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2620 2542
2621=cut 2543=cut
2622 2544
2623our $GOTOGEN; 2545our $GOTOGEN;
2624 2546
… …
2771 $self->contr->savebed ($map, $x, $y) 2693 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2694 if $exit->flag (cf::FLAG_DAMNED);
2773 2695
2774 1 2696 1
2775 }) { 2697 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2702
2781 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
… …
2847 id => "infobox", 2769 id => "infobox",
2848 title => "Body Parts", 2770 title => "Body Parts",
2849 reply => undef, 2771 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2851 }, 2773 },
2774 "c/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2780 "c/skills" => {
2781 id => "infobox",
2782 title => "Skills",
2783 reply => undef,
2784 tooltip => "Shows your experience per skill and item power",
2785 },
2786 "c/resistances" => {
2787 id => "infobox",
2788 title => "Resistances",
2789 reply => undef,
2790 tooltip => "Shows your resistances",
2791 },
2792 "c/pets" => {
2793 id => "infobox",
2794 title => "Pets",
2795 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet",
2797 },
2852 "c/uptime" => { 2798 "c/uptime" => {
2853 id => "infobox", 2799 id => "infobox",
2854 title => "Uptime", 2800 title => "Uptime",
2855 reply => undef, 2801 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 2802 tooltip => "How long the server has been running since last restart",
… …
2865 id => "party", 2811 id => "party",
2866 title => "Party", 2812 title => "Party",
2867 reply => "gsay ", 2813 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 2814 tooltip => "Messages and chat related to your party",
2869 }, 2815 },
2816 "c/death" => {
2817 id => "death",
2818 title => "Death",
2819 reply => undef,
2820 tooltip => "Reason for and more info about your most recent death",
2821 },
2822 "c/say" => $SAY_CHANNEL,
2823 "c/chat" => $CHAT_CHANNEL,
2870); 2824);
2871 2825
2872sub cf::client::send_msg { 2826sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2874 2828
2875 $msg = $self->pl->expand_cfpod ($msg); 2829 $msg = $self->pl->expand_cfpod ($msg)
2830 unless $color & cf::NDI_VERBATIM;
2876 2831
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 2832 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 2833
2879 # check predefined channels, for the benefit of C 2834 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 2835 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 2836 $channel = $CHANNEL{$channel};
2882 2837
2883 $self->ext_msg (channel_info => $channel) 2838 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 2839 $channel = $channel->{id};
2887 2840
2888 } elsif (ref $channel) { 2841 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 2842 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 2843 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 2844 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 2845 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 2846 }
2895 2847
2896 $channel = $channel->{id}; 2848 $channel = $channel->{id};
2897 } 2849 }
2898 2850
2899 return unless @extra || length $msg; 2851 return unless @extra || length $msg;
2900 2852
2901 if ($self->can_msg) {
2902 # default colour, mask it out 2853 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2905 2856
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 2860 );
2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919 2861
2920 $color &= cf::NDI_COLOR_MASK; 2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2921 2865
2922 utf8::encode $msg; 2866 # split very large packets
2923 2867 if (8192 < length $pkt and $self->{can_lzf}) {
2924 if (0 && $msg =~ /\[/) { 2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2925 # COMMAND/INFO 2869 $pkt = "frag";
2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2927 } else {
2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2929 $self->send_packet ("drawinfo $color $msg")
2930 }
2931 }
2932 } 2870 }
2871
2872 $self->send_packet ($pkt);
2933} 2873}
2934 2874
2935=item $client->ext_msg ($type, @msg) 2875=item $client->ext_msg ($type, @msg)
2936 2876
2937Sends an ext event to the client. 2877Sends an ext event to the client.
… …
3127=cut 3067=cut
3128 3068
3129for ( 3069for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3131 insert remove inv nrof name archname title slaying race 3071 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3072 decrease split destroy change_exp)],
3133 ["cf::object::player" => qw(player)], 3073 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3074 ["cf::player" => qw(peaceful)],
3135 ["cf::map" => qw(trigger)], 3075 ["cf::map" => qw(trigger)],
3136) { 3076) {
3137 no strict 'refs'; 3077 no strict 'refs';
… …
3395 reload_treasures; 3335 reload_treasures;
3396 3336
3397 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
3398} 3338}
3399 3339
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3340sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3342 or return;
3409 3343
3410 local $/; 3344 local $/;
… …
3422 }; 3356 };
3423 warn $@ if $@; 3357 warn $@ if $@;
3424 } 3358 }
3425} 3359}
3426 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3427sub main { 3380sub main {
3381 cf::init_globals; # initialise logging
3382
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394
3428 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3398 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3435 }; 3402 };
3436 3403
3437 { 3404 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3405
3406 cf::sync_job {
3407 reload_resources;
3439 reload_config; 3408 reload_config;
3440 db_init; 3409 db_init;
3410
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid;
3414 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills;
3417
3418 cf::init_beforeplay;
3419
3420 atomic;
3421
3441 load_extensions; 3422 load_extensions;
3442 3423
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3424 utime time, time, $RUNTIMEFILE;
3425
3426 # no (long-running) fork's whatsoever before this point(!)
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428
3429 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3430 };
3445 3431
3446 EV::loop; 3432 EV::loop;
3447} 3433}
3448 3434
3449############################################################################# 3435#############################################################################
… …
3458 }; 3444 };
3459 } 3445 }
3460} 3446}
3461 3447
3462sub write_runtime_sync { 3448sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime";
3464
3465 # first touch the runtime file to show we are still running: 3449 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3450 # the fsync below can take a very very long time.
3467 3451
3468 IO::AIO::aio_utime $runtime, undef, undef; 3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3453
3470 my $guard = cf::lock_acquire "write_runtime"; 3454 my $guard = cf::lock_acquire "write_runtime";
3471 3455
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3473 or return; 3457 or return;
3474 3458
3475 my $value = $cf::RUNTIME + 90 + 10; 3459 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3460 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3461 # 60 allows for the watchdog to kill the server.
… …
3487 aio_utime $fh, undef, undef; 3471 aio_utime $fh, undef, undef;
3488 3472
3489 close $fh 3473 close $fh
3490 or return; 3474 or return;
3491 3475
3492 aio_rename "$runtime~", $runtime 3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3477 and return;
3494 3478
3495 warn "runtime file written.\n"; 3479 warn "runtime file written.\n";
3496 3480
3497 1 3481 1
… …
3509 my $uuid = "$LOCALDIR/uuid"; 3493 my $uuid = "$LOCALDIR/uuid";
3510 3494
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3496 or return;
3513 3497
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3498 my $value = uuid_seq uuid_cur;
3499
3500 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n";
3502 return;
3503 }
3504
3505 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3506 $uuid_skip = 0;
3516 3507
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3509 and return;
3519 3510
… …
3541} 3532}
3542 3533
3543sub emergency_save() { 3534sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
3545 3536
3546 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
3547 3538
3548 cf::sync_job { 3539 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544
3549 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3551 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3553 $pl->save;
3558 } 3554 }
3559 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
3560 3556
3561 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3560 $map->valid or next;
3565 $map->save; 3561 $map->save;
3566 } 3562 }
3567 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
3568 3564
3569 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3572 3568
3573 warn "begin write uuid\n"; 3569 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3570 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3571 warn "emergency_perl_save: end write uuid\n";
3576 }; 3572 };
3577 3573
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3578 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
3579} 3580}
3580 3581
3581sub post_cleanup { 3582sub post_cleanup {
3582 my ($make_core) = @_; 3583 my ($make_core) = @_;
3583 3584
3584 warn Carp::longmess "post_cleanup backtrace" 3585 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3586 if $make_core;
3587
3588 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$;
3590}
3591
3592# a safer delete_package, copied from Symbol
3593sub clear_package($) {
3594 my $pkg = shift;
3595
3596 # expand to full symbol table name if needed
3597 unless ($pkg =~ /^main::.*::$/) {
3598 $pkg = "main$pkg" if $pkg =~ /^::/;
3599 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3600 $pkg .= '::' unless $pkg =~ /::$/;
3601 }
3602
3603 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3604 my $stem_symtab = *{$stem}{HASH};
3605
3606 defined $stem_symtab and exists $stem_symtab->{$leaf}
3607 or return;
3608
3609 # clear all symbols
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 }
3615 warn "cleared package $pkg\n";#d#
3586} 3616}
3587 3617
3588sub do_reload_perl() { 3618sub do_reload_perl() {
3589 # can/must only be called in main 3619 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
3592 return; 3622 return;
3593 } 3623 }
3594 3624
3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3628
3629 while ($RELOAD) {
3595 warn "reloading..."; 3630 warn "reloading...";
3596 3631
3597 warn "entering sync_job"; 3632 warn "entering sync_job";
3598 3633
3599 cf::sync_job { 3634 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3635 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3636 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3603 3638
3604 warn "syncing database to disk"; 3639 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3640 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3641
3607 # if anything goes wrong in here, we should simply crash as we already saved 3642 # if anything goes wrong in here, we should simply crash as we already saved
3608 3643
3609 warn "flushing outstanding aio requests"; 3644 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3645 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3646 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3647 }
3641 3648
3642 warn "... nuking $pkg"; 3649 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3650 $_->cancel for values %EXT_CORO;
3644 } 3651 %EXT_CORO = ();
3645 3652
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3653 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3654 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3655
3656 warn "removing ext/exti commands";
3657 %EXTCMD = ();
3658 %EXTICMD = ();
3659
3660 warn "unloading/nuking all extensions";
3661 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3662 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3663
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3664 if (my $cb = $pkg->can ("unload")) {
3665 eval {
3657 $cb->(); 3666 $cb->($pkg);
3667 1
3668 } or warn "$pkg unloaded, but with errors: $@";
3669 }
3670
3671 warn "... clearing $pkg";
3672 clear_package $pkg;
3658 } 3673 }
3659 3674
3660 Symbol::delete_package $k; 3675 warn "unloading all perl modules loaded from $LIBDIR";
3676 while (my ($k, $v) = each %INC) {
3677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3678
3679 warn "... unloading $k";
3680 delete $INC{$k};
3681
3682 $k =~ s/\.pm$//;
3683 $k =~ s/\//::/g;
3684
3685 if (my $cb = $k->can ("unload_module")) {
3686 $cb->();
3687 }
3688
3689 clear_package $k;
3661 } 3690 }
3662 3691
3663 warn "getting rid of safe::, as good as possible"; 3692 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3693 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3695
3667 warn "unloading cf.pm \"a bit\""; 3696 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3697 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3698 delete $INC{"cf/pod.pm"};
3670 3699
3671 # don't, removes xs symbols, too, 3700 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3701 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3702 #clear_package __PACKAGE__;
3674 3703
3675 warn "unload completed, starting to reload now"; 3704 warn "unload completed, starting to reload now";
3676 3705
3677 warn "reloading cf.pm"; 3706 warn "reloading cf.pm";
3678 require cf; 3707 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3680 3709
3681 warn "loading config and database again"; 3710 warn "loading config and database again";
3682 cf::reload_config; 3711 cf::reload_config;
3683 3712
3684 warn "loading extensions"; 3713 warn "loading extensions";
3685 cf::load_extensions; 3714 cf::load_extensions;
3686 3715
3716 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3722 reattach $_ for values %PLAYER;
3723 }
3693 3724
3725 warn "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3727
3694 warn "leaving sync_job"; 3728 warn "leaving sync_job";
3695 3729
3696 1 3730 1
3697 } or do { 3731 } or do {
3698 warn $@; 3732 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3733 cf::cleanup "error while reloading, exiting.";
3700 }; 3734 };
3701 3735
3702 warn "reloaded"; 3736 warn "reloaded";
3737 --$RELOAD;
3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3703}; 3742};
3704 3743
3705our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3706 3745
3707sub reload_perl() { 3746sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3710 3749
3750 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions;
3752
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3754 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3756 };
3714 }; 3757 };
3715} 3758}
3716 3759
3717register_command "reload" => sub { 3760register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;
… …
3793 BDB::max_poll_reqs $TICK * 0.1; 3836 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3837 $AnyEvent::BDB::WATCHER->priority (1);
3795 3838
3796 unless ($DB_ENV) { 3839 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3840 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3841 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 3842 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3843 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3844 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3845 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3846
3803 cf::sync_job { 3847 cf::sync_job {
3804 eval { 3848 eval {
… …
3830{ 3874{
3831 # configure IO::AIO 3875 # configure IO::AIO
3832 3876
3833 IO::AIO::min_parallel 8; 3877 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 3878 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 3879 undef $AnyEvent::AIO::WATCHER;
3836} 3880}
3837 3881
3838my $_log_backtrace; 3882my $_log_backtrace;
3839 3883
3840sub _log_backtrace { 3884sub _log_backtrace {
… …
3843 $msg =~ s/\n//; 3887 $msg =~ s/\n//;
3844 3888
3845 # limit the # of concurrent backtraces 3889 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 3890 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 3891 ++$_log_backtrace;
3892 my $perl_bt = Carp::longmess $msg;
3848 async { 3893 async {
3849 $Coro::current->{desc} = "abt $msg"; 3894 $Coro::current->{desc} = "abt $msg";
3850 3895
3851 my @bt = fork_call { 3896 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 3897 @addr = map { sprintf "%x", $_ } @addr;
… …
3863 } 3908 }
3864 3909
3865 @funcs 3910 @funcs
3866 }; 3911 };
3867 3912
3868 LOG llevInfo, "[ABT] $msg\n"; 3913 LOG llevInfo, "[ABT] $perl_bt\n";
3914 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 3915 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 3916 --$_log_backtrace;
3871 }; 3917 };
3872 } else { 3918 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 3919 LOG llevInfo, "[ABT] $msg\n";
… …
3878# load additional modules 3924# load additional modules
3879use cf::pod; 3925use cf::pod;
3880 3926
3881END { cf::emergency_save } 3927END { cf::emergency_save }
3882 3928
3883evthread_start IO::AIO::poll_fileno;
3884
38851 39291
3886 3930

Diff Legend

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