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.442 by root, Sun Aug 31 09:03:31 2008 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 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
1630sub expand_cfpod {
1631 my ($self, $pod) = @_;
1632
1633 my @nest = [qr<\G$>, undef, ""];
1634 my $xml;
1635
1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1648
1649 my $cb;
1650
1651 if ($code eq "B") {
1652 $cb = sub { "<b>$_[0]</b>" };
1653 } elsif ($code eq "C") {
1654 $cb = sub { "<tt>$_[0]</tt>" };
1655 } elsif ($code eq "E") {
1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1708 }
1709 }
1710
1711 $xml
1712}
1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718 1659
1719=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1720 1661
1721Sends an ext reply to the player. 1662Sends an ext reply to the player.
1722 1663
1935 1876
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1938} 1879}
1939 1880
1940# and all this just because we cannot iterate over
1941# all maps in C++...
1942sub change_all_map_light {
1943 my ($change) = @_;
1944
1945 $_->change_map_light ($change)
1946 for grep $_->outdoor, values %cf::MAP;
1947}
1948
1949sub decay_objects { 1881sub decay_objects {
1950 my ($self) = @_; 1882 my ($self) = @_;
1951 1883
1952 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1953 1885
2035sub find { 1967sub find {
2036 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
2037 1969
2038 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
2039 1971
2040 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
2042 1974
2043 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
2048 or return; 1977 or return;
2049 1978
2050 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
2051 1980
2118 2047
2119 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2049 $self->decay_objects;
2121 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2122 $self->update_buttons; 2051 $self->update_buttons;
2123 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick; 2052 cf::cede_to_tick;
2126 $self->activate; 2053 $self->activate;
2127 } 2054 }
2128 2055
2129 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
2471 2398
2472our $SAY_CHANNEL = { 2399our $SAY_CHANNEL = {
2473 id => "say", 2400 id => "say",
2474 title => "Map", 2401 title => "Map",
2475 reply => "say ", 2402 reply => "say ",
2476 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.",
2477}; 2404};
2478 2405
2479our $CHAT_CHANNEL = { 2406our $CHAT_CHANNEL = {
2480 id => "chat", 2407 id => "chat",
2481 title => "Chat", 2408 title => "Chat",
2536 2463
2537=item $player_object->enter_link 2464=item $player_object->enter_link
2538 2465
2539Freezes 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}>).
2540 2467
2541The 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.
2542I<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.
2543 2472
2544Will never block. 2473Will never block.
2545 2474
2546=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2547 2476
2605 2534
2606 $map->load; 2535 $map->load;
2607 $map->load_neighbours; 2536 $map->load_neighbours;
2608 2537
2609 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2610 $self->activate_recursive; 2540 $self->activate_recursive;
2611 2541
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2614} 2544}
2777 $self->contr->savebed ($map, $x, $y) 2707 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2708 if $exit->flag (cf::FLAG_DAMNED);
2779 2709
2780 1 2710 1
2781 }) { 2711 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "I'll try to bring you back to the map you were before. " 2713 . "I'll try to bring you back to the map you were before. "
2784 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2716
2787 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
2853 id => "infobox", 2783 id => "infobox",
2854 title => "Body Parts", 2784 title => "Body Parts",
2855 reply => undef, 2785 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2857 }, 2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2794 "c/skills" => {
2795 id => "infobox",
2796 title => "Skills",
2797 reply => undef,
2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2823 },
2858 "c/uptime" => { 2824 "c/uptime" => {
2859 id => "infobox", 2825 id => "infobox",
2860 title => "Uptime", 2826 title => "Uptime",
2861 reply => undef, 2827 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 2828 tooltip => "How long the server has been running since last restart",
2871 id => "party", 2837 id => "party",
2872 title => "Party", 2838 title => "Party",
2873 reply => "gsay ", 2839 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 2840 tooltip => "Messages and chat related to your party",
2875 }, 2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2876); 2850);
2877 2851
2878sub cf::client::send_msg { 2852sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2880 2854
2881 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2882 2857
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 2859
2885 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2888 2863
2889 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2893 2866
2894 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 2872 }
2901 2873
2902 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2903 } 2875 }
2904 2876
2905 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2906 2878
2907 if ($self->can_msg) {
2908 # default colour, mask it out 2879 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2911 2882
2912 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2914 } else { 2886 );
2915 if ($color >= 0) {
2916 # replace some tags by gcfclient-compatible ones
2917 for ($msg) {
2918 1 while
2919 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924 }
2925 2887
2926 $color &= cf::NDI_COLOR_MASK; 2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2927 2891
2928 utf8::encode $msg; 2892 # split very large packets
2929 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2930 if (0 && $msg =~ /\[/) { 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2931 # COMMAND/INFO 2895 $pkt = "frag";
2932 $self->send_packet ("drawextinfo $color 10 8 $msg")
2933 } else {
2934 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2935 $self->send_packet ("drawinfo $color $msg")
2936 }
2937 }
2938 } 2896 }
2897
2898 $self->send_packet ($pkt);
2939} 2899}
2940 2900
2941=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2942 2902
2943Sends an ext event to the client. 2903Sends an ext event to the client.
3118The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3119 3079
3120 cf::object 3080 cf::object
3121 contr pay_amount pay_player map x y force_find force_add destroy 3081 contr pay_amount pay_player map x y force_find force_add destroy
3122 insert remove name archname title slaying race decrease split 3082 insert remove name archname title slaying race decrease split
3083 value
3123 3084
3124 cf::object::player 3085 cf::object::player
3125 player 3086 player
3126 3087
3127 cf::player 3088 cf::player
3133=cut 3094=cut
3134 3095
3135for ( 3096for (
3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3137 insert remove inv nrof name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3139 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3140 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3141 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3142) { 3103) {
3143 no strict 'refs'; 3104 no strict 'refs';
3144 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3145 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3162 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3163 3124
3164 my $qcode = $code; 3125 my $qcode = $code;
3165 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3166 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3167 3130
3168 local $_; 3131 local $_;
3169 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3170 3133
3171 my $eval = 3134 my $eval =
3401 reload_treasures; 3364 reload_treasures;
3402 3365
3403 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
3404} 3367}
3405 3368
3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 reload_resources;
3412}
3413
3414sub reload_config { 3369sub reload_config {
3415 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
3416 or return; 3371 or return;
3417 3372
3418 local $/; 3373 local $/;
3430 }; 3385 };
3431 warn $@ if $@; 3386 warn $@ if $@;
3432 } 3387 }
3433} 3388}
3434 3389
3390sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!";
3393 flock $fh, &Fcntl::LOCK_EX
3394 or die "$PIDFILE: flock: $!";
3395 $fh
3396}
3397
3398# make sure only one server instance is running at any one time
3399sub atomic {
3400 my $fh = pidfile;
3401
3402 my $pid = <$fh>;
3403 kill 9, $pid if $pid > 0;
3404
3405 seek $fh, 0, 0;
3406 print $fh $$;
3407}
3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
3435sub main { 3418sub main {
3419 cf::init_globals; # initialise logging
3420
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432
3436 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3437 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3439 (async { 3436 (async {
3440 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT; 3438 EV::loop EV::LOOP_ONESHOT;
3442 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3443 }; 3440 };
3444 3441
3445 { 3442 evthread_start IO::AIO::poll_fileno;
3446 my $guard = freeze_mainloop; 3443
3444 cf::sync_job {
3445 reload_resources;
3447 reload_config; 3446 reload_config;
3448 db_init; 3447 db_init;
3448
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid;
3452 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills;
3455
3456 cf::init_beforeplay;
3457
3458 atomic;
3459
3449 load_extensions; 3460 load_extensions;
3450 3461
3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3462 utime time, time, $RUNTIMEFILE;
3463
3464 # no (long-running) fork's whatsoever before this point(!)
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466
3467 (pop @POST_INIT)->(0) while @POST_INIT;
3452 } 3468 };
3453 3469
3454 EV::loop; 3470 main_loop;
3455} 3471}
3456 3472
3457############################################################################# 3473#############################################################################
3458# initialisation and cleanup 3474# initialisation and cleanup
3459 3475
3466 }; 3482 };
3467 } 3483 }
3468} 3484}
3469 3485
3470sub write_runtime_sync { 3486sub write_runtime_sync {
3471 my $runtime = "$LOCALDIR/runtime";
3472
3473 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3474 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3475 3489
3476 IO::AIO::aio_utime $runtime, undef, undef; 3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3477 3491
3478 my $guard = cf::lock_acquire "write_runtime"; 3492 my $guard = cf::lock_acquire "write_runtime";
3479 3493
3480 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3481 or return; 3495 or return;
3482 3496
3483 my $value = $cf::RUNTIME + 90 + 10; 3497 my $value = $cf::RUNTIME + 90 + 10;
3484 # 10 is the runtime save interval, for a monotonic clock 3498 # 10 is the runtime save interval, for a monotonic clock
3485 # 60 allows for the watchdog to kill the server. 3499 # 60 allows for the watchdog to kill the server.
3495 aio_utime $fh, undef, undef; 3509 aio_utime $fh, undef, undef;
3496 3510
3497 close $fh 3511 close $fh
3498 or return; 3512 or return;
3499 3513
3500 aio_rename "$runtime~", $runtime 3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3501 and return; 3515 and return;
3502 3516
3503 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3504 3518
3505 1 3519 1
3517 my $uuid = "$LOCALDIR/uuid"; 3531 my $uuid = "$LOCALDIR/uuid";
3518 3532
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return; 3534 or return;
3521 3535
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3536 my $value = uuid_seq uuid_cur;
3537
3538 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n";
3540 return;
3541 }
3542
3543 my $value = uuid_str $value + $uuid_skip;
3523 $uuid_skip = 0; 3544 $uuid_skip = 0;
3524 3545
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3546 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return; 3547 and return;
3527 3548
3549} 3570}
3550 3571
3551sub emergency_save() { 3572sub emergency_save() {
3552 my $freeze_guard = cf::freeze_mainloop; 3573 my $freeze_guard = cf::freeze_mainloop;
3553 3574
3554 warn "enter emergency perl save\n"; 3575 warn "emergency_perl_save: enter\n";
3555 3576
3556 cf::sync_job { 3577 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582
3557 # use a peculiar iteration method to avoid tripping on perl 3583 # use a peculiar iteration method to avoid tripping on perl
3558 # refcount bugs in for. also avoids problems with players 3584 # refcount bugs in for. also avoids problems with players
3559 # and maps saved/destroyed asynchronously. 3585 # and maps saved/destroyed asynchronously.
3560 warn "begin emergency player save\n"; 3586 warn "emergency_perl_save: begin player save\n";
3561 for my $login (keys %cf::PLAYER) { 3587 for my $login (keys %cf::PLAYER) {
3562 my $pl = $cf::PLAYER{$login} or next; 3588 my $pl = $cf::PLAYER{$login} or next;
3563 $pl->valid or next; 3589 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3565 $pl->save; 3591 $pl->save;
3566 } 3592 }
3567 warn "end emergency player save\n"; 3593 warn "emergency_perl_save: end player save\n";
3568 3594
3569 warn "begin emergency map save\n"; 3595 warn "emergency_perl_save: begin map save\n";
3570 for my $path (keys %cf::MAP) { 3596 for my $path (keys %cf::MAP) {
3571 my $map = $cf::MAP{$path} or next; 3597 my $map = $cf::MAP{$path} or next;
3572 $map->valid or next; 3598 $map->valid or next;
3573 $map->save; 3599 $map->save;
3574 } 3600 }
3575 warn "end emergency map save\n"; 3601 warn "emergency_perl_save: end map save\n";
3576 3602
3577 warn "begin emergency database checkpoint\n"; 3603 warn "emergency_perl_save: begin database checkpoint\n";
3578 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3579 warn "end emergency database checkpoint\n"; 3605 warn "emergency_perl_save: end database checkpoint\n";
3580 3606
3581 warn "begin write uuid\n"; 3607 warn "emergency_perl_save: begin write uuid\n";
3582 write_uuid_sync 1; 3608 write_uuid_sync 1;
3583 warn "end write uuid\n"; 3609 warn "emergency_perl_save: end write uuid\n";
3584 }; 3610 };
3585 3611
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3586 warn "leave emergency perl save\n"; 3617 warn "emergency_perl_save: leave\n";
3587} 3618}
3588 3619
3589sub post_cleanup { 3620sub post_cleanup {
3590 my ($make_core) = @_; 3621 my ($make_core) = @_;
3591 3622
3592 warn Carp::longmess "post_cleanup backtrace" 3623 warn Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3624 if $make_core;
3625
3626 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$;
3594} 3628}
3595 3629
3596# a safer delete_package, copied from Symbol 3630# a safer delete_package, copied from Symbol
3597sub clear_package($) { 3631sub clear_package($) {
3598 my $pkg = shift; 3632 my $pkg = shift;
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) { 3649 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"}; 3650 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 } 3652 }
3619 warn "cleared package #$pkg\n";#d# 3653 warn "cleared package $pkg\n";#d#
3620} 3654}
3621
3622our $RELOAD; # how many times to reload
3623 3655
3624sub do_reload_perl() { 3656sub do_reload_perl() {
3625 # can/must only be called in main 3657 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3658 if ($Coro::current != $Coro::main) {
3627 warn "can only reload from main coroutine"; 3659 warn "can only reload from main coroutine";
3628 return; 3660 return;
3629 } 3661 }
3630 3662
3631 return if $RELOAD++; 3663 return if $RELOAD++;
3664
3665 my $t1 = EV::time;
3632 3666
3633 while ($RELOAD) { 3667 while ($RELOAD) {
3634 warn "reloading..."; 3668 warn "reloading...";
3635 3669
3636 warn "entering sync_job"; 3670 warn "entering sync_job";
3697 clear_package "safe::$_" 3731 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3733
3700 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3737
3704 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3739 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3707 3741
3715 cf::reload_config; 3749 cf::reload_config;
3716 3750
3717 warn "loading extensions"; 3751 warn "loading extensions";
3718 cf::load_extensions; 3752 cf::load_extensions;
3719 3753
3754 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3755 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3756 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3757 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3758 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3759 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3760 reattach $_ for values %PLAYER;
3761 }
3762
3763 warn "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3726 3765
3727 warn "leaving sync_job"; 3766 warn "leaving sync_job";
3728 3767
3729 1 3768 1
3730 } or do { 3769 } or do {
3733 }; 3772 };
3734 3773
3735 warn "reloaded"; 3774 warn "reloaded";
3736 --$RELOAD; 3775 --$RELOAD;
3737 } 3776 }
3777
3778 $t1 = EV::time - $t1;
3779 warn "reload completed in ${t1}s\n";
3738}; 3780};
3739 3781
3740our $RELOAD_WATCHER; # used only during reload 3782our $RELOAD_WATCHER; # used only during reload
3741 3783
3742sub reload_perl() { 3784sub reload_perl() {
3743 # doing reload synchronously and two reloads happen back-to-back, 3785 # doing reload synchronously and two reloads happen back-to-back,
3744 # coro crashes during coro_state_free->destroy here. 3786 # coro crashes during coro_state_free->destroy here.
3745 3787
3788 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions;
3790
3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3747 do_reload_perl; 3792 do_reload_perl;
3748 undef $RELOAD_WATCHER; 3793 undef $RELOAD_WATCHER;
3794 };
3749 }; 3795 };
3750} 3796}
3751 3797
3752register_command "reload" => sub { 3798register_command "reload" => sub {
3753 my ($who, $arg) = @_; 3799 my ($who, $arg) = @_;
3879 $msg =~ s/\n//; 3925 $msg =~ s/\n//;
3880 3926
3881 # limit the # of concurrent backtraces 3927 # limit the # of concurrent backtraces
3882 if ($_log_backtrace < 2) { 3928 if ($_log_backtrace < 2) {
3883 ++$_log_backtrace; 3929 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg;
3884 async { 3931 async {
3885 $Coro::current->{desc} = "abt $msg"; 3932 $Coro::current->{desc} = "abt $msg";
3886 3933
3887 my @bt = fork_call { 3934 my @bt = fork_call {
3888 @addr = map { sprintf "%x", $_ } @addr; 3935 @addr = map { sprintf "%x", $_ } @addr;
3899 } 3946 }
3900 3947
3901 @funcs 3948 @funcs
3902 }; 3949 };
3903 3950
3904 LOG llevInfo, "[ABT] $msg\n"; 3951 LOG llevInfo, "[ABT] $perl_bt\n";
3952 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3905 LOG llevInfo, "[ABT] $_\n" for @bt; 3953 LOG llevInfo, "[ABT] $_\n" for @bt;
3906 --$_log_backtrace; 3954 --$_log_backtrace;
3907 }; 3955 };
3908 } else { 3956 } else {
3909 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $msg\n";
3910 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3911 } 3959 }
3912} 3960}
3913 3961
3914# load additional modules 3962# load additional modules
3915use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3916 3964
3917END { cf::emergency_save } 3965END { cf::emergency_save }
3918 3966
39191 39671
3920 3968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines