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.441 by root, Sat Aug 30 05:19:03 2008 UTC vs.
Revision 1.476 by root, Wed Sep 2 16:54:20 2009 UTC

21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
63 65
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 76
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 79
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 81
74our %COMMAND = (); 82our %COMMAND = ();
75our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
78our %EXTCMD = (); 86our %EXTCMD = ();
79our %EXTICMD = (); 87our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
82 90
83our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 92our @EVENT;
85 93
86our $CONFDIR = confdir; 94our $CONFDIR = confdir;
87our $DATADIR = datadir; 95our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
97our %RESOURCE; 108our %RESOURCE;
98 109
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 112our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
103 114
104our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 118our $DB_ENV;
108 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
109our %CFG; 122our %CFG;
110 123
111our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 125our $RUNTIME;
113our $NOW; 126our $NOW;
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 137our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
126 139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
144
127binmode STDOUT; 145binmode STDOUT;
128binmode STDERR; 146binmode STDERR;
129 147
130# read virtual server time, if available 148# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
135} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
136 156
137mkdir $_ 157mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 159
140our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 320
301sub encode_json($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
303 323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
337
304=item cf::lock_wait $string 338=item cf::lock_wait $string
305 339
306Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
307 341
308=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
309 343
310Wait until the given lock is available and then acquires it and returns 344Wait 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, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
313returned. 347returned.
314 348
315Locks are *not* recursive, locking from the same coro twice results in a 349Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 350deadlocked coro.
322 356
323Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
324 358
325=cut 359=cut
326 360
327our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 362
330sub lock_wait($) { 363sub lock_wait($) {
331 my ($key) = @_; 364 $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} 365}
344 366
345sub lock_acquire($) { 367sub lock_acquire($) {
346 my ($key) = @_; 368 $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} 369}
360 370
361sub lock_active($) { 371sub lock_active($) {
362 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 373}
366 374
367sub freeze_mainloop { 375sub freeze_mainloop {
368 tick_inhibit_inc; 376 tick_inhibit_inc;
369 377
370 Coro::guard \&tick_inhibit_dec; 378 &Guard::guard (\&tick_inhibit_dec);
371} 379}
372 380
373=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
374 382
375Like EV::periodic, but randomly selects a starting point so that the actions 383Like EV::periodic, but randomly selects a starting point so that the actions
727 735
728############################################################################# 736#############################################################################
729 737
730=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
731 739
732Many objects in crossfire are so-called attachable objects. That means you can 740Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
735 743
736In the following description, CLASS can be any of C<global>, C<object> 744In 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 745C<player>, C<client> or C<map> (i.e. the attachable objects in
787=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
788 796
789Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
791 799
792Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 801that are attached at load/instantiate time, thus the need for a name.
794 802
795These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
796 804
797=over 4 805=over 4
1147 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1148 1156
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1158 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1162 aio_fsync $fh;
1163 }
1153 aio_close $fh; 1164 aio_close $fh;
1154 1165
1155 if (@$objs) { 1166 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1168 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1173 aio_fsync $fh;
1174 }
1161 aio_close $fh; 1175 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1177 }
1164 } else { 1178 } else {
1165 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1166 } 1180 }
1167 1181
1168 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1186 } else {
1170 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1171 } 1188 }
1172 } else { 1189 } else {
1173 aio_unlink $filename; 1190 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1175 } 1192 }
1266 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1267 1284
1268 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1269} 1286}
1270 1287
1288use File::Glob ();
1289
1271cf::player->attach ( 1290cf::player->attach (
1272 on_command => sub { 1291 on_command => sub {
1273 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1274 1293
1275 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
1306 } 1325 }
1307 1326
1308 cf::override; 1327 cf::override;
1309 }, 1328 },
1310); 1329);
1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1311 1343
1312sub load_extensions { 1344sub load_extensions {
1313 cf::sync_job { 1345 cf::sync_job {
1314 my %todo; 1346 my %todo;
1315 1347
1385 1417
1386=back 1418=back
1387 1419
1388=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1389 1421
1390Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1391 1423
1392=cut 1424=cut
1393 1425
1394package cf::player; 1426package cf::player;
1395 1427
1438 1470
1439sub exists($) { 1471sub exists($) {
1440 my ($login) = @_; 1472 my ($login) = @_;
1441 1473
1442 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1444} 1476}
1445 1477
1446sub find($) { 1478sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1480 my $login = $_[0];
1523 my ($pl) = @_; 1555 my ($pl) = @_;
1524 1556
1525 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1526 1558
1527 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we nuked the dir 1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1561
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1563 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score; 1565 $pl->ob->check_score;
1619 } 1651 }
1620 1652
1621 \@paths 1653 \@paths
1622} 1654}
1623 1655
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1657
1626Expand crossfire pod fragments into protocol xml. 1658Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1641sub expand_cfpod {
1642 my ($self, $pod) = @_;
1643
1644 my $xml;
1645
1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1649
1650 $group =~ s/&/&amp;/g;
1651 $group =~ s/</&lt;/g;
1652
1653 $xml .= $group;
1654 } elsif ($pod =~ m%\G
1655 ([BCGHITU])
1656 <
1657 (?:
1658 ([^<>]*) (?{ $group = $^N })
1659 | < $interior >
1660 )
1661 >
1662 %gcsx
1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1683 "")
1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1695
1696 for ($xml) {
1697 # create single paragraphs (very hackish)
1698 s/(?<=\S)\n(?=\w)/ /g;
1699
1700 # compress some whitespace
1701 s/\s+\n/\n/g; # ws line-ends
1702 s/\n\n+/\n/g; # double lines
1703 s/^\n+//; # beginning lines
1704 s/\n+$//; # ending lines
1705 }
1706
1707 $xml
1708}
1709
1710no re 'eval';
1711
1712sub hintmode {
1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1714 $_[0]{hintmode}
1715}
1716 1659
1717=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1718 1661
1719Sends an ext reply to the player. 1662Sends an ext reply to the player.
1720 1663
1933 1876
1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1935 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1936} 1879}
1937 1880
1938# and all this just because we cannot iterate over
1939# all maps in C++...
1940sub change_all_map_light {
1941 my ($change) = @_;
1942
1943 $_->change_map_light ($change)
1944 for grep $_->outdoor, values %cf::MAP;
1945}
1946
1947sub decay_objects { 1881sub decay_objects {
1948 my ($self) = @_; 1882 my ($self) = @_;
1949 1883
1950 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1951 1885
2033sub find { 1967sub find {
2034 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
2035 1969
2036 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
2037 1971
2038 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
2040 1974
2041 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
2045 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
2046 or return; 1977 or return;
2047 1978
2048 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
2049 1980
2116 2047
2117 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2118 $self->decay_objects; 2049 $self->decay_objects;
2119 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2120 $self->update_buttons; 2051 $self->update_buttons;
2121 cf::cede_to_tick;
2122 $self->set_darkness_map;
2123 cf::cede_to_tick; 2052 cf::cede_to_tick;
2124 $self->activate; 2053 $self->activate;
2125 } 2054 }
2126 2055
2127 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
2469 2398
2470our $SAY_CHANNEL = { 2399our $SAY_CHANNEL = {
2471 id => "say", 2400 id => "say",
2472 title => "Map", 2401 title => "Map",
2473 reply => "say ", 2402 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2475}; 2404};
2476 2405
2477our $CHAT_CHANNEL = { 2406our $CHAT_CHANNEL = {
2478 id => "chat", 2407 id => "chat",
2479 title => "Chat", 2408 title => "Chat",
2534 2463
2535=item $player_object->enter_link 2464=item $player_object->enter_link
2536 2465
2537Freezes the player and moves him/her to a special map (C<{link}>). 2466Freezes the player and moves him/her to a special map (C<{link}>).
2538 2467
2539The player should be reasonably safe there for short amounts of time. You 2468The player should be reasonably safe there for short amounts of time (e.g.
2540I<MUST> call C<leave_link> as soon as possible, though. 2469for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link
2471map.
2541 2472
2542Will never block. 2473Will never block.
2543 2474
2544=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2545 2476
2603 2534
2604 $map->load; 2535 $map->load;
2605 $map->load_neighbours; 2536 $map->load_neighbours;
2606 2537
2607 return unless $self->contr->active; 2538 return unless $self->contr->active;
2608 $self->activate_recursive;
2609 2539
2610 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2611 $self->enter_map ($map, $x, $y); 2541 $self->enter_map ($map, $x, $y);
2542
2543 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive;
2612} 2545}
2613 2546
2614=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2615 2548
2616Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
2775 $self->contr->savebed ($map, $x, $y) 2708 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED); 2709 if $exit->flag (cf::FLAG_DAMNED);
2777 2710
2778 1 2711 1
2779 }) { 2712 }) {
2780 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2781 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2782 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2783 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2784 2717
2785 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2851 id => "infobox", 2784 id => "infobox",
2852 title => "Body Parts", 2785 title => "Body Parts",
2853 reply => undef, 2786 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available", 2787 tooltip => "Shows which body parts you posess and are available",
2855 }, 2788 },
2789 "c/statistics" => {
2790 id => "infobox",
2791 title => "Statistics",
2792 reply => undef,
2793 tooltip => "Shows your primary statistics",
2794 },
2795 "c/skills" => {
2796 id => "infobox",
2797 title => "Skills",
2798 reply => undef,
2799 tooltip => "Shows your experience per skill and item power",
2800 },
2801 "c/shopitems" => {
2802 id => "infobox",
2803 title => "Shop Items",
2804 reply => undef,
2805 tooltip => "Shows the items currently for sale in this shop",
2806 },
2807 "c/resistances" => {
2808 id => "infobox",
2809 title => "Resistances",
2810 reply => undef,
2811 tooltip => "Shows your resistances",
2812 },
2813 "c/pets" => {
2814 id => "infobox",
2815 title => "Pets",
2816 reply => undef,
2817 tooltip => "Shows information abotu your pets/a specific pet",
2818 },
2819 "c/perceiveself" => {
2820 id => "infobox",
2821 title => "Perceive Self",
2822 reply => undef,
2823 tooltip => "You gained detailed knowledge about yourself",
2824 },
2856 "c/uptime" => { 2825 "c/uptime" => {
2857 id => "infobox", 2826 id => "infobox",
2858 title => "Uptime", 2827 title => "Uptime",
2859 reply => undef, 2828 reply => undef,
2860 tooltip => "How long the server has been running since last restart", 2829 tooltip => "How long the server has been running since last restart",
2869 id => "party", 2838 id => "party",
2870 title => "Party", 2839 title => "Party",
2871 reply => "gsay ", 2840 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party", 2841 tooltip => "Messages and chat related to your party",
2873 }, 2842 },
2843 "c/death" => {
2844 id => "death",
2845 title => "Death",
2846 reply => undef,
2847 tooltip => "Reason for and more info about your most recent death",
2848 },
2849 "c/say" => $SAY_CHANNEL,
2850 "c/chat" => $CHAT_CHANNEL,
2874); 2851);
2875 2852
2876sub cf::client::send_msg { 2853sub cf::client::send_msg {
2877 my ($self, $channel, $msg, $color, @extra) = @_; 2854 my ($self, $channel, $msg, $color, @extra) = @_;
2878 2855
2879 $msg = $self->pl->expand_cfpod ($msg); 2856 $msg = $self->pl->expand_cfpod ($msg)
2857 unless $color & cf::NDI_VERBATIM;
2880 2858
2881 $color &= cf::NDI_CLIENT_MASK; # just in case... 2859 $color &= cf::NDI_CLIENT_MASK; # just in case...
2882 2860
2883 # check predefined channels, for the benefit of C 2861 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) { 2862 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel}; 2863 $channel = $CHANNEL{$channel};
2886 2864
2887 $self->ext_msg (channel_info => $channel) 2865 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id}; 2866 $channel = $channel->{id};
2891 2867
2892 } elsif (ref $channel) { 2868 } elsif (ref $channel) {
2893 # send meta info to client, if not yet sent 2869 # send meta info to client, if not yet sent
2894 unless (exists $self->{channel}{$channel->{id}}) { 2870 unless (exists $self->{channel}{$channel->{id}}) {
2895 $self->{channel}{$channel->{id}} = $channel; 2871 $self->{channel}{$channel->{id}} = $channel;
2896 $self->ext_msg (channel_info => $channel) 2872 $self->ext_msg (channel_info => $channel);
2897 if $self->can_msg;
2898 } 2873 }
2899 2874
2900 $channel = $channel->{id}; 2875 $channel = $channel->{id};
2901 } 2876 }
2902 2877
2903 return unless @extra || length $msg; 2878 return unless @extra || length $msg;
2904 2879
2905 if ($self->can_msg) {
2906 # default colour, mask it out 2880 # default colour, mask it out
2907 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2881 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2908 if $color & cf::NDI_DEF; 2882 if $color & cf::NDI_DEF;
2909 2883
2910 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2884 my $pkt = "msg "
2885 . $self->{json_coder}->encode (
2911 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2912 } else { 2887 );
2913 if ($color >= 0) {
2914 # replace some tags by gcfclient-compatible ones
2915 for ($msg) {
2916 1 while
2917 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2918 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2919 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2920 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2921 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2922 }
2923 2888
2924 $color &= cf::NDI_COLOR_MASK; 2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2925 2892
2926 utf8::encode $msg; 2893 # split very large packets
2927 2894 if (8192 < length $pkt and $self->{can_lzf}) {
2928 if (0 && $msg =~ /\[/) { 2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2929 # COMMAND/INFO 2896 $pkt = "frag";
2930 $self->send_packet ("drawextinfo $color 10 8 $msg")
2931 } else {
2932 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2933 $self->send_packet ("drawinfo $color $msg")
2934 }
2935 }
2936 } 2897 }
2898
2899 $self->send_packet ($pkt);
2937} 2900}
2938 2901
2939=item $client->ext_msg ($type, @msg) 2902=item $client->ext_msg ($type, @msg)
2940 2903
2941Sends an ext event to the client. 2904Sends an ext event to the client.
3116The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
3117 3080
3118 cf::object 3081 cf::object
3119 contr pay_amount pay_player map x y force_find force_add destroy 3082 contr pay_amount pay_player map x y force_find force_add destroy
3120 insert remove name archname title slaying race decrease split 3083 insert remove name archname title slaying race decrease split
3084 value
3121 3085
3122 cf::object::player 3086 cf::object::player
3123 player 3087 player
3124 3088
3125 cf::player 3089 cf::player
3131=cut 3095=cut
3132 3096
3133for ( 3097for (
3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3098 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3135 insert remove inv nrof name archname title slaying race 3099 insert remove inv nrof name archname title slaying race
3136 decrease split destroy change_exp)], 3100 decrease split destroy change_exp value msg lore send_msg)],
3137 ["cf::object::player" => qw(player)], 3101 ["cf::object::player" => qw(player)],
3138 ["cf::player" => qw(peaceful)], 3102 ["cf::player" => qw(peaceful send_msg)],
3139 ["cf::map" => qw(trigger)], 3103 ["cf::map" => qw(trigger)],
3140) { 3104) {
3141 no strict 'refs'; 3105 no strict 'refs';
3142 my ($pkg, @funs) = @$_; 3106 my ($pkg, @funs) = @$_;
3143 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3107 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3160 my ($code, %vars) = @_; 3124 my ($code, %vars) = @_;
3161 3125
3162 my $qcode = $code; 3126 my $qcode = $code;
3163 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3164 $qcode =~ s/\n/\\n/g; 3128 $qcode =~ s/\n/\\n/g;
3129
3130 %vars = (_dummy => 0) unless %vars;
3165 3131
3166 local $_; 3132 local $_;
3167 local @safe::cf::_safe_eval_args = values %vars; 3133 local @safe::cf::_safe_eval_args = values %vars;
3168 3134
3169 my $eval = 3135 my $eval =
3399 reload_treasures; 3365 reload_treasures;
3400 3366
3401 warn "finished reloading resource files\n"; 3367 warn "finished reloading resource files\n";
3402} 3368}
3403 3369
3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3409 reload_resources;
3410}
3411
3412sub reload_config { 3370sub reload_config {
3413 open my $fh, "<:utf8", "$CONFDIR/config" 3371 open my $fh, "<:utf8", "$CONFDIR/config"
3414 or return; 3372 or return;
3415 3373
3416 local $/; 3374 local $/;
3428 }; 3386 };
3429 warn $@ if $@; 3387 warn $@ if $@;
3430 } 3388 }
3431} 3389}
3432 3390
3391sub pidfile() {
3392 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3393 or die "$PIDFILE: $!";
3394 flock $fh, &Fcntl::LOCK_EX
3395 or die "$PIDFILE: flock: $!";
3396 $fh
3397}
3398
3399# make sure only one server instance is running at any one time
3400sub atomic {
3401 my $fh = pidfile;
3402
3403 my $pid = <$fh>;
3404 kill 9, $pid if $pid > 0;
3405
3406 seek $fh, 0, 0;
3407 print $fh $$;
3408}
3409
3410sub main_loop {
3411 warn "EV::loop starting\n";
3412 if (1) {
3413 EV::loop;
3414 }
3415 warn "EV::loop returned\n";
3416 goto &main_loop unless $REALLY_UNLOOP;
3417}
3418
3433sub main { 3419sub main {
3420 cf::init_globals; # initialise logging
3421
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433
3434 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3437 (async { 3437 (async {
3438 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3440 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3441 }; 3441 };
3442 3442
3443 { 3443 evthread_start IO::AIO::poll_fileno;
3444 my $guard = freeze_mainloop; 3444
3445 cf::sync_job {
3446 reload_resources;
3445 reload_config; 3447 reload_config;
3446 db_init; 3448 db_init;
3449
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid;
3453 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills;
3456
3457 cf::init_beforeplay;
3458
3459 atomic;
3460
3447 load_extensions; 3461 load_extensions;
3448 3462
3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3463 utime time, time, $RUNTIMEFILE;
3464
3465 # no (long-running) fork's whatsoever before this point(!)
3466 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468
3469 (pop @POST_INIT)->(0) while @POST_INIT;
3450 } 3470 };
3451 3471
3452 EV::loop; 3472 main_loop;
3453} 3473}
3454 3474
3455############################################################################# 3475#############################################################################
3456# initialisation and cleanup 3476# initialisation and cleanup
3457 3477
3464 }; 3484 };
3465 } 3485 }
3466} 3486}
3467 3487
3468sub write_runtime_sync { 3488sub write_runtime_sync {
3469 my $runtime = "$LOCALDIR/runtime";
3470
3471 # first touch the runtime file to show we are still running: 3489 # first touch the runtime file to show we are still running:
3472 # the fsync below can take a very very long time. 3490 # the fsync below can take a very very long time.
3473 3491
3474 IO::AIO::aio_utime $runtime, undef, undef; 3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3475 3493
3476 my $guard = cf::lock_acquire "write_runtime"; 3494 my $guard = cf::lock_acquire "write_runtime";
3477 3495
3478 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3479 or return; 3497 or return;
3480 3498
3481 my $value = $cf::RUNTIME + 90 + 10; 3499 my $value = $cf::RUNTIME + 90 + 10;
3482 # 10 is the runtime save interval, for a monotonic clock 3500 # 10 is the runtime save interval, for a monotonic clock
3483 # 60 allows for the watchdog to kill the server. 3501 # 60 allows for the watchdog to kill the server.
3493 aio_utime $fh, undef, undef; 3511 aio_utime $fh, undef, undef;
3494 3512
3495 close $fh 3513 close $fh
3496 or return; 3514 or return;
3497 3515
3498 aio_rename "$runtime~", $runtime 3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3499 and return; 3517 and return;
3500 3518
3501 warn "runtime file written.\n"; 3519 warn "runtime file written.\n";
3502 3520
3503 1 3521 1
3515 my $uuid = "$LOCALDIR/uuid"; 3533 my $uuid = "$LOCALDIR/uuid";
3516 3534
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3535 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return; 3536 or return;
3519 3537
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3538 my $value = uuid_seq uuid_cur;
3539
3540 unless ($value) {
3541 warn "cowardly refusing to write zero uuid value!\n";
3542 return;
3543 }
3544
3545 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3546 $uuid_skip = 0;
3522 3547
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3548 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return; 3549 and return;
3525 3550
3547} 3572}
3548 3573
3549sub emergency_save() { 3574sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3575 my $freeze_guard = cf::freeze_mainloop;
3551 3576
3552 warn "enter emergency perl save\n"; 3577 warn "emergency_perl_save: enter\n";
3553 3578
3554 cf::sync_job { 3579 cf::sync_job {
3580 # this is a trade-off: we want to be very quick here, so
3581 # save all maps without fsync, and later call a global sync
3582 # (which in turn might be very very slow)
3583 local $USE_FSYNC = 0;
3584
3555 # use a peculiar iteration method to avoid tripping on perl 3585 # use a peculiar iteration method to avoid tripping on perl
3556 # refcount bugs in for. also avoids problems with players 3586 # refcount bugs in for. also avoids problems with players
3557 # and maps saved/destroyed asynchronously. 3587 # and maps saved/destroyed asynchronously.
3558 warn "begin emergency player save\n"; 3588 warn "emergency_perl_save: begin player save\n";
3559 for my $login (keys %cf::PLAYER) { 3589 for my $login (keys %cf::PLAYER) {
3560 my $pl = $cf::PLAYER{$login} or next; 3590 my $pl = $cf::PLAYER{$login} or next;
3561 $pl->valid or next; 3591 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3563 $pl->save; 3593 $pl->save;
3564 } 3594 }
3565 warn "end emergency player save\n"; 3595 warn "emergency_perl_save: end player save\n";
3566 3596
3567 warn "begin emergency map save\n"; 3597 warn "emergency_perl_save: begin map save\n";
3568 for my $path (keys %cf::MAP) { 3598 for my $path (keys %cf::MAP) {
3569 my $map = $cf::MAP{$path} or next; 3599 my $map = $cf::MAP{$path} or next;
3570 $map->valid or next; 3600 $map->valid or next;
3571 $map->save; 3601 $map->save;
3572 } 3602 }
3573 warn "end emergency map save\n"; 3603 warn "emergency_perl_save: end map save\n";
3574 3604
3575 warn "begin emergency database checkpoint\n"; 3605 warn "emergency_perl_save: begin database checkpoint\n";
3576 BDB::db_env_txn_checkpoint $DB_ENV; 3606 BDB::db_env_txn_checkpoint $DB_ENV;
3577 warn "end emergency database checkpoint\n"; 3607 warn "emergency_perl_save: end database checkpoint\n";
3578 3608
3579 warn "begin write uuid\n"; 3609 warn "emergency_perl_save: begin write uuid\n";
3580 write_uuid_sync 1; 3610 write_uuid_sync 1;
3581 warn "end write uuid\n"; 3611 warn "emergency_perl_save: end write uuid\n";
3582 }; 3612 };
3583 3613
3614 warn "emergency_perl_save: starting sync()\n";
3615 IO::AIO::aio_sync sub {
3616 warn "emergency_perl_save: finished sync()\n";
3617 };
3618
3584 warn "leave emergency perl save\n"; 3619 warn "emergency_perl_save: leave\n";
3585} 3620}
3586 3621
3587sub post_cleanup { 3622sub post_cleanup {
3588 my ($make_core) = @_; 3623 my ($make_core) = @_;
3589 3624
3590 warn Carp::longmess "post_cleanup backtrace" 3625 warn Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3626 if $make_core;
3627
3628 my $fh = pidfile;
3629 unlink $PIDFILE if <$fh> == $$;
3592} 3630}
3593 3631
3594# a safer delete_package, copied from Symbol 3632# a safer delete_package, copied from Symbol
3595sub clear_package($) { 3633sub clear_package($) {
3596 my $pkg = shift; 3634 my $pkg = shift;
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) { 3651 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"}; 3652 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 } 3654 }
3617 warn "cleared package #$pkg\n";#d# 3655 warn "cleared package $pkg\n";#d#
3618} 3656}
3619
3620our $RELOAD; # how many times to reload
3621 3657
3622sub do_reload_perl() { 3658sub do_reload_perl() {
3623 # can/must only be called in main 3659 # can/must only be called in main
3624 if ($Coro::current != $Coro::main) { 3660 if ($Coro::current != $Coro::main) {
3625 warn "can only reload from main coroutine"; 3661 warn "can only reload from main coroutine";
3626 return; 3662 return;
3627 } 3663 }
3628 3664
3629 return if $RELOAD++; 3665 return if $RELOAD++;
3666
3667 my $t1 = EV::time;
3630 3668
3631 while ($RELOAD) { 3669 while ($RELOAD) {
3632 warn "reloading..."; 3670 warn "reloading...";
3633 3671
3634 warn "entering sync_job"; 3672 warn "entering sync_job";
3695 clear_package "safe::$_" 3733 clear_package "safe::$_"
3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3734 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3697 3735
3698 warn "unloading cf.pm \"a bit\""; 3736 warn "unloading cf.pm \"a bit\"";
3699 delete $INC{"cf.pm"}; 3737 delete $INC{"cf.pm"};
3700 delete $INC{"cf/pod.pm"}; 3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3701 3739
3702 # don't, removes xs symbols, too, 3740 # don't, removes xs symbols, too,
3703 # and global variables created in xs 3741 # and global variables created in xs
3704 #clear_package __PACKAGE__; 3742 #clear_package __PACKAGE__;
3705 3743
3713 cf::reload_config; 3751 cf::reload_config;
3714 3752
3715 warn "loading extensions"; 3753 warn "loading extensions";
3716 cf::load_extensions; 3754 cf::load_extensions;
3717 3755
3756 if ($REATTACH_ON_RELOAD) {
3718 warn "reattaching attachments to objects/players"; 3757 warn "reattaching attachments to objects/players";
3719 _global_reattach; # objects, sockets 3758 _global_reattach; # objects, sockets
3720 warn "reattaching attachments to maps"; 3759 warn "reattaching attachments to maps";
3721 reattach $_ for values %MAP; 3760 reattach $_ for values %MAP;
3722 warn "reattaching attachments to players"; 3761 warn "reattaching attachments to players";
3723 reattach $_ for values %PLAYER; 3762 reattach $_ for values %PLAYER;
3763 }
3764
3765 warn "running post_init jobs";
3766 (pop @POST_INIT)->(1) while @POST_INIT;
3724 3767
3725 warn "leaving sync_job"; 3768 warn "leaving sync_job";
3726 3769
3727 1 3770 1
3728 } or do { 3771 } or do {
3731 }; 3774 };
3732 3775
3733 warn "reloaded"; 3776 warn "reloaded";
3734 --$RELOAD; 3777 --$RELOAD;
3735 } 3778 }
3779
3780 $t1 = EV::time - $t1;
3781 warn "reload completed in ${t1}s\n";
3736}; 3782};
3737 3783
3738our $RELOAD_WATCHER; # used only during reload 3784our $RELOAD_WATCHER; # used only during reload
3739 3785
3740sub reload_perl() { 3786sub reload_perl() {
3741 # doing reload synchronously and two reloads happen back-to-back, 3787 # doing reload synchronously and two reloads happen back-to-back,
3742 # coro crashes during coro_state_free->destroy here. 3788 # coro crashes during coro_state_free->destroy here.
3743 3789
3790 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions;
3792
3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3745 do_reload_perl; 3794 do_reload_perl;
3746 undef $RELOAD_WATCHER; 3795 undef $RELOAD_WATCHER;
3796 };
3747 }; 3797 };
3748} 3798}
3749 3799
3750register_command "reload" => sub { 3800register_command "reload" => sub {
3751 my ($who, $arg) = @_; 3801 my ($who, $arg) = @_;
3877 $msg =~ s/\n//; 3927 $msg =~ s/\n//;
3878 3928
3879 # limit the # of concurrent backtraces 3929 # limit the # of concurrent backtraces
3880 if ($_log_backtrace < 2) { 3930 if ($_log_backtrace < 2) {
3881 ++$_log_backtrace; 3931 ++$_log_backtrace;
3932 my $perl_bt = Carp::longmess $msg;
3882 async { 3933 async {
3883 $Coro::current->{desc} = "abt $msg"; 3934 $Coro::current->{desc} = "abt $msg";
3884 3935
3885 my @bt = fork_call { 3936 my @bt = fork_call {
3886 @addr = map { sprintf "%x", $_ } @addr; 3937 @addr = map { sprintf "%x", $_ } @addr;
3897 } 3948 }
3898 3949
3899 @funcs 3950 @funcs
3900 }; 3951 };
3901 3952
3902 LOG llevInfo, "[ABT] $msg\n"; 3953 LOG llevInfo, "[ABT] $perl_bt\n";
3954 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3903 LOG llevInfo, "[ABT] $_\n" for @bt; 3955 LOG llevInfo, "[ABT] $_\n" for @bt;
3904 --$_log_backtrace; 3956 --$_log_backtrace;
3905 }; 3957 };
3906 } else { 3958 } else {
3907 LOG llevInfo, "[ABT] $msg\n"; 3959 LOG llevInfo, "[ABT] $msg\n";
3908 LOG llevInfo, "[ABT] [suppressed]\n"; 3960 LOG llevInfo, "[ABT] [suppressed]\n";
3909 } 3961 }
3910} 3962}
3911 3963
3912# load additional modules 3964# load additional modules
3913use cf::pod; 3965require "cf/$_.pm" for @EXTRA_MODULES;
3914 3966
3915END { cf::emergency_save } 3967END { cf::emergency_save }
3916 3968
39171 39691
3918 3970

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines