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.443 by root, Sun Aug 31 10:05:26 2008 UTC vs.
Revision 1.477 by root, Wed Sep 2 22:52:36 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;
202 222
203=back 223=back
204 224
205=cut 225=cut
206 226
207BEGIN { 227$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 228 my $msg = join "", @_;
210 229
211 $msg .= "\n" 230 $msg .= "\n"
212 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
213 232
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 234
216 LOG llevError, $msg; 235 LOG llevError, $msg;
217 }; 236};
218}
219 237
220$Coro::State::DIEHOOK = sub { 238$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 239 return unless $^S eq 0; # "eq", not "=="
240
241 warn Carp::longmess $_[0];
222 242
223 if ($Coro::current == $Coro::main) {#d# 243 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 245 return;#d#
226 }#d# 246 }#d#
227 247
228 # kill coroutine otherwise 248 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 249 Coro::terminate
231}; 250};
232
233$SIG{__DIE__} = sub { }; #d#?
234 251
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 252@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 253@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 254@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 255@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 316our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 317
301sub encode_json($) { $json_coder->encode ($_[0]) } 318sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 319sub decode_json($) { $json_coder->decode ($_[0]) }
303 320
321=item cf::post_init { BLOCK }
322
323Execute the given codeblock, I<after> all extensions have been (re-)loaded,
324but I<before> the server starts ticking again.
325
326The cdoeblock will have a single boolean argument to indicate whether this
327is a reload or not.
328
329=cut
330
331sub post_init(&) {
332 push @POST_INIT, shift;
333}
334
304=item cf::lock_wait $string 335=item cf::lock_wait $string
305 336
306Wait until the given lock is available. See cf::lock_acquire. 337Wait until the given lock is available. See cf::lock_acquire.
307 338
308=item my $lock = cf::lock_acquire $string 339=item my $lock = cf::lock_acquire $string
309 340
310Wait until the given lock is available and then acquires it and returns 341Wait 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, 342a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 343for example when the coroutine gets canceled), the lock is automatically
313returned. 344returned.
314 345
315Locks are *not* recursive, locking from the same coro twice results in a 346Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 347deadlocked coro.
322 353
323Return true if the lock is currently active, i.e. somebody has locked it. 354Return true if the lock is currently active, i.e. somebody has locked it.
324 355
325=cut 356=cut
326 357
327our %LOCK; 358our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 359
330sub lock_wait($) { 360sub lock_wait($) {
331 my ($key) = @_; 361 $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} 362}
344 363
345sub lock_acquire($) { 364sub lock_acquire($) {
346 my ($key) = @_; 365 $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} 366}
360 367
361sub lock_active($) { 368sub lock_active($) {
362 my ($key) = @_; 369 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 370}
366 371
367sub freeze_mainloop { 372sub freeze_mainloop {
368 tick_inhibit_inc; 373 tick_inhibit_inc;
369 374
370 Coro::guard \&tick_inhibit_dec; 375 &Guard::guard (\&tick_inhibit_dec);
371} 376}
372 377
373=item cf::periodic $interval, $cb 378=item cf::periodic $interval, $cb
374 379
375Like EV::periodic, but randomly selects a starting point so that the actions 380Like EV::periodic, but randomly selects a starting point so that the actions
727 732
728############################################################################# 733#############################################################################
729 734
730=head2 ATTACHABLE OBJECTS 735=head2 ATTACHABLE OBJECTS
731 736
732Many objects in crossfire are so-called attachable objects. That means you can 737Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 738attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 739to it. All such attachable objects support the following methods.
735 740
736In the following description, CLASS can be any of C<global>, C<object> 741In 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 742C<player>, C<client> or C<map> (i.e. the attachable objects in
787=item cf::CLASS::attachment $name, ... 792=item cf::CLASS::attachment $name, ...
788 793
789Register an attachment by C<$name> through which attachable objects of the 794Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 795given CLASS can refer to this attachment.
791 796
792Some classes such as crossfire maps and objects can specify attachments 797Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 798that are attached at load/instantiate time, thus the need for a name.
794 799
795These calls expect any number of the following handler/hook descriptions: 800These calls expect any number of the following handler/hook descriptions:
796 801
797=over 4 802=over 4
1147 $decname, length $$rdata, scalar @$objs; 1152 $decname, length $$rdata, scalar @$objs;
1148 1153
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1155 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1157 if ($cf::USE_FSYNC) {
1158 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;
1159 aio_fsync $fh;
1160 }
1153 aio_close $fh; 1161 aio_close $fh;
1154 1162
1155 if (@$objs) { 1163 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1164 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1165 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1166 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1167 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1168 if ($cf::USE_FSYNC) {
1169 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;
1170 aio_fsync $fh;
1171 }
1161 aio_close $fh; 1172 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1173 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1174 }
1164 } else { 1175 } else {
1165 aio_unlink "$filename.pst"; 1176 aio_unlink "$filename.pst";
1166 } 1177 }
1167 1178
1168 aio_rename "$filename~", $filename; 1179 aio_rename "$filename~", $filename;
1180
1181 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1183 } else {
1170 warn "FATAL: $filename~: $!\n"; 1184 warn "unable to save objects: $filename~: $!\n";
1171 } 1185 }
1172 } else { 1186 } else {
1173 aio_unlink $filename; 1187 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1175 } 1189 }
1266 my ($name, $cb) = @_; 1280 my ($name, $cb) = @_;
1267 1281
1268 $EXTICMD{$name} = $cb; 1282 $EXTICMD{$name} = $cb;
1269} 1283}
1270 1284
1285use File::Glob ();
1286
1271cf::player->attach ( 1287cf::player->attach (
1272 on_command => sub { 1288 on_command => sub {
1273 my ($pl, $name, $params) = @_; 1289 my ($pl, $name, $params) = @_;
1274 1290
1275 my $cb = $COMMAND{$name} 1291 my $cb = $COMMAND{$name}
1306 } 1322 }
1307 1323
1308 cf::override; 1324 cf::override;
1309 }, 1325 },
1310); 1326);
1327
1328# "readahead" all extensions
1329sub cache_extensions {
1330 my $grp = IO::AIO::aio_group;
1331
1332 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1333 for (grep /\.ext$/, @{$_[0]}) {
1334 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1335 }
1336 };
1337
1338 $grp
1339}
1311 1340
1312sub load_extensions { 1341sub load_extensions {
1313 cf::sync_job { 1342 cf::sync_job {
1314 my %todo; 1343 my %todo;
1315 1344
1385 1414
1386=back 1415=back
1387 1416
1388=head2 CORE EXTENSIONS 1417=head2 CORE EXTENSIONS
1389 1418
1390Functions and methods that extend core crossfire objects. 1419Functions and methods that extend core deliantra objects.
1391 1420
1392=cut 1421=cut
1393 1422
1394package cf::player; 1423package cf::player;
1395 1424
1438 1467
1439sub exists($) { 1468sub exists($) {
1440 my ($login) = @_; 1469 my ($login) = @_;
1441 1470
1442 $cf::PLAYER{$login} 1471 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1472 or !aio_stat path $login
1444} 1473}
1445 1474
1446sub find($) { 1475sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1476 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1477 my $login = $_[0];
1619 } 1648 }
1620 1649
1621 \@paths 1650 \@paths
1622} 1651}
1623 1652
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1653=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1654
1626Expand crossfire pod fragments into protocol xml. 1655Expand 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 1656
1719=item $player->ext_reply ($msgid, @msg) 1657=item $player->ext_reply ($msgid, @msg)
1720 1658
1721Sends an ext reply to the player. 1659Sends an ext reply to the player.
1722 1660
1935 1873
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 1875 "$UNIQUEDIR/$path"
1938} 1876}
1939 1877
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 { 1878sub decay_objects {
1950 my ($self) = @_; 1879 my ($self) = @_;
1951 1880
1952 return if $self->{deny_reset}; 1881 return if $self->{deny_reset};
1953 1882
2035sub find { 1964sub find {
2036 my ($path, $origin) = @_; 1965 my ($path, $origin) = @_;
2037 1966
2038 $path = normalise $path, $origin && $origin->path; 1967 $path = normalise $path, $origin && $origin->path;
2039 1968
2040 cf::lock_wait "map_data:$path";#d#remove 1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 1970 my $guard2 = cf::lock_acquire "map_find:$path";
2042 1971
2043 $cf::MAP{$path} || do { 1972 $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 1973 my $map = new_from_path cf::map $path
2048 or return; 1974 or return;
2049 1975
2050 $map->{last_save} = $cf::RUNTIME; 1976 $map->{last_save} = $cf::RUNTIME;
2051 1977
2118 2044
2119 unless ($self->{deny_activate}) { 2045 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2046 $self->decay_objects;
2121 $self->fix_auto_apply; 2047 $self->fix_auto_apply;
2122 $self->update_buttons; 2048 $self->update_buttons;
2123 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick; 2049 cf::cede_to_tick;
2126 $self->activate; 2050 $self->activate;
2127 } 2051 }
2128 2052
2129 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
2471 2395
2472our $SAY_CHANNEL = { 2396our $SAY_CHANNEL = {
2473 id => "say", 2397 id => "say",
2474 title => "Map", 2398 title => "Map",
2475 reply => "say ", 2399 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2400 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2477}; 2401};
2478 2402
2479our $CHAT_CHANNEL = { 2403our $CHAT_CHANNEL = {
2480 id => "chat", 2404 id => "chat",
2481 title => "Chat", 2405 title => "Chat",
2536 2460
2537=item $player_object->enter_link 2461=item $player_object->enter_link
2538 2462
2539Freezes the player and moves him/her to a special map (C<{link}>). 2463Freezes the player and moves him/her to a special map (C<{link}>).
2540 2464
2541The player should be reasonably safe there for short amounts of time. You 2465The player should be reasonably safe there for short amounts of time (e.g.
2542I<MUST> call C<leave_link> as soon as possible, though. 2466for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link
2468map.
2543 2469
2544Will never block. 2470Will never block.
2545 2471
2546=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2547 2473
2605 2531
2606 $map->load; 2532 $map->load;
2607 $map->load_neighbours; 2533 $map->load_neighbours;
2608 2534
2609 return unless $self->contr->active; 2535 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2536
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2538 $self->enter_map ($map, $x, $y);
2539
2540 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive;
2614} 2542}
2615 2543
2616=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2617 2545
2618Moves the player to the given map-path and coordinates by first freezing 2546Moves the player to the given map-path and coordinates by first freezing
2777 $self->contr->savebed ($map, $x, $y) 2705 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2706 if $exit->flag (cf::FLAG_DAMNED);
2779 2707
2780 1 2708 1
2781 }) { 2709 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2710 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "I'll try to bring you back to the map you were before. " 2711 . "I'll try to bring you back to the map you were before. "
2784 . "Please report this to the dungeon master!", 2712 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2713 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2714
2787 warn "ERROR in enter_exit: $@"; 2715 warn "ERROR in enter_exit: $@";
2853 id => "infobox", 2781 id => "infobox",
2854 title => "Body Parts", 2782 title => "Body Parts",
2855 reply => undef, 2783 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 2784 tooltip => "Shows which body parts you posess and are available",
2857 }, 2785 },
2786 "c/statistics" => {
2787 id => "infobox",
2788 title => "Statistics",
2789 reply => undef,
2790 tooltip => "Shows your primary statistics",
2791 },
2792 "c/skills" => {
2793 id => "infobox",
2794 title => "Skills",
2795 reply => undef,
2796 tooltip => "Shows your experience per skill and item power",
2797 },
2798 "c/shopitems" => {
2799 id => "infobox",
2800 title => "Shop Items",
2801 reply => undef,
2802 tooltip => "Shows the items currently for sale in this shop",
2803 },
2804 "c/resistances" => {
2805 id => "infobox",
2806 title => "Resistances",
2807 reply => undef,
2808 tooltip => "Shows your resistances",
2809 },
2810 "c/pets" => {
2811 id => "infobox",
2812 title => "Pets",
2813 reply => undef,
2814 tooltip => "Shows information abotu your pets/a specific pet",
2815 },
2816 "c/perceiveself" => {
2817 id => "infobox",
2818 title => "Perceive Self",
2819 reply => undef,
2820 tooltip => "You gained detailed knowledge about yourself",
2821 },
2858 "c/uptime" => { 2822 "c/uptime" => {
2859 id => "infobox", 2823 id => "infobox",
2860 title => "Uptime", 2824 title => "Uptime",
2861 reply => undef, 2825 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 2826 tooltip => "How long the server has been running since last restart",
2871 id => "party", 2835 id => "party",
2872 title => "Party", 2836 title => "Party",
2873 reply => "gsay ", 2837 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 2838 tooltip => "Messages and chat related to your party",
2875 }, 2839 },
2840 "c/death" => {
2841 id => "death",
2842 title => "Death",
2843 reply => undef,
2844 tooltip => "Reason for and more info about your most recent death",
2845 },
2846 "c/say" => $SAY_CHANNEL,
2847 "c/chat" => $CHAT_CHANNEL,
2876); 2848);
2877 2849
2878sub cf::client::send_msg { 2850sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 2851 my ($self, $channel, $msg, $color, @extra) = @_;
2880 2852
2881 $msg = $self->pl->expand_cfpod ($msg); 2853 $msg = $self->pl->expand_cfpod ($msg)
2854 unless $color & cf::NDI_VERBATIM;
2882 2855
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 2856 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 2857
2885 # check predefined channels, for the benefit of C 2858 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 2859 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 2860 $channel = $CHANNEL{$channel};
2888 2861
2889 $self->ext_msg (channel_info => $channel) 2862 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2893 2864
2894 } elsif (ref $channel) { 2865 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 2866 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 2867 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 2868 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 2869 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 2870 }
2901 2871
2902 $channel = $channel->{id}; 2872 $channel = $channel->{id};
2903 } 2873 }
2904 2874
2905 return unless @extra || length $msg; 2875 return unless @extra || length $msg;
2906 2876
2907 if ($self->can_msg) {
2908 # default colour, mask it out 2877 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 2879 if $color & cf::NDI_DEF;
2911 2880
2912 my $pkt = "msg " 2881 my $pkt = "msg "
2913 . $self->{json_coder}->encode ( 2882 . $self->{json_coder}->encode (
2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 ); 2884 );
2916 2885
2917 # try lzf for large packets 2886 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt 2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf}; 2888 if 1024 <= length $pkt and $self->{can_lzf};
2920 2889
2921 # split very large packets 2890 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) { 2891 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag"; 2893 $pkt = "frag";
2925 } 2894 }
2926 2895
2927 $self->send_packet ($pkt); 2896 $self->send_packet ($pkt);
2928 } else {
2929 if ($color >= 0) {
2930 # replace some tags by gcfclient-compatible ones
2931 for ($msg) {
2932 1 while
2933 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2934 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2935 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2936 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2937 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2938 }
2939
2940 $color &= cf::NDI_COLOR_MASK;
2941
2942 utf8::encode $msg;
2943
2944 if (0 && $msg =~ /\[/) {
2945 # COMMAND/INFO
2946 $self->send_packet ("drawextinfo $color 10 8 $msg")
2947 } else {
2948 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2949 $self->send_packet ("drawinfo $color $msg")
2950 }
2951 }
2952 }
2953} 2897}
2954 2898
2955=item $client->ext_msg ($type, @msg) 2899=item $client->ext_msg ($type, @msg)
2956 2900
2957Sends an ext event to the client. 2901Sends an ext event to the client.
3132The following functions and methods are available within a safe environment: 3076The following functions and methods are available within a safe environment:
3133 3077
3134 cf::object 3078 cf::object
3135 contr pay_amount pay_player map x y force_find force_add destroy 3079 contr pay_amount pay_player map x y force_find force_add destroy
3136 insert remove name archname title slaying race decrease split 3080 insert remove name archname title slaying race decrease split
3081 value
3137 3082
3138 cf::object::player 3083 cf::object::player
3139 player 3084 player
3140 3085
3141 cf::player 3086 cf::player
3147=cut 3092=cut
3148 3093
3149for ( 3094for (
3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3151 insert remove inv nrof name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3152 decrease split destroy change_exp)], 3097 decrease split destroy change_exp value msg lore send_msg)],
3153 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3154 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful send_msg)],
3155 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3156) { 3101) {
3157 no strict 'refs'; 3102 no strict 'refs';
3158 my ($pkg, @funs) = @$_; 3103 my ($pkg, @funs) = @$_;
3159 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3176 my ($code, %vars) = @_; 3121 my ($code, %vars) = @_;
3177 3122
3178 my $qcode = $code; 3123 my $qcode = $code;
3179 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3180 $qcode =~ s/\n/\\n/g; 3125 $qcode =~ s/\n/\\n/g;
3126
3127 %vars = (_dummy => 0) unless %vars;
3181 3128
3182 local $_; 3129 local $_;
3183 local @safe::cf::_safe_eval_args = values %vars; 3130 local @safe::cf::_safe_eval_args = values %vars;
3184 3131
3185 my $eval = 3132 my $eval =
3415 reload_treasures; 3362 reload_treasures;
3416 3363
3417 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3418} 3365}
3419 3366
3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3425 reload_resources;
3426}
3427
3428sub reload_config { 3367sub reload_config {
3429 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
3430 or return; 3369 or return;
3431 3370
3432 local $/; 3371 local $/;
3444 }; 3383 };
3445 warn $@ if $@; 3384 warn $@ if $@;
3446 } 3385 }
3447} 3386}
3448 3387
3388sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!";
3391 flock $fh, &Fcntl::LOCK_EX
3392 or die "$PIDFILE: flock: $!";
3393 $fh
3394}
3395
3396# make sure only one server instance is running at any one time
3397sub atomic {
3398 my $fh = pidfile;
3399
3400 my $pid = <$fh>;
3401 kill 9, $pid if $pid > 0;
3402
3403 seek $fh, 0, 0;
3404 print $fh $$;
3405}
3406
3407sub main_loop {
3408 warn "EV::loop starting\n";
3409 if (1) {
3410 EV::loop;
3411 }
3412 warn "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP;
3414}
3415
3449sub main { 3416sub main {
3417 cf::init_globals; # initialise logging
3418
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430
3450 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3453 (async { 3434 (async {
3454 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT; 3436 EV::loop EV::LOOP_ONESHOT;
3456 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3457 }; 3438 };
3458 3439
3459 { 3440 evthread_start IO::AIO::poll_fileno;
3460 my $guard = freeze_mainloop; 3441
3442 cf::sync_job {
3443 reload_resources;
3461 reload_config; 3444 reload_config;
3462 db_init; 3445 db_init;
3446
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid;
3450 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills;
3453
3454 cf::init_beforeplay;
3455
3456 atomic;
3457
3463 load_extensions; 3458 load_extensions;
3464 3459
3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3460 utime time, time, $RUNTIMEFILE;
3461
3462 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465
3466 (pop @POST_INIT)->(0) while @POST_INIT;
3466 } 3467 };
3467 3468
3468 EV::loop; 3469 main_loop;
3469} 3470}
3470 3471
3471############################################################################# 3472#############################################################################
3472# initialisation and cleanup 3473# initialisation and cleanup
3473 3474
3480 }; 3481 };
3481 } 3482 }
3482} 3483}
3483 3484
3484sub write_runtime_sync { 3485sub write_runtime_sync {
3485 my $runtime = "$LOCALDIR/runtime";
3486
3487 # first touch the runtime file to show we are still running: 3486 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3487 # the fsync below can take a very very long time.
3489 3488
3490 IO::AIO::aio_utime $runtime, undef, undef; 3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3490
3492 my $guard = cf::lock_acquire "write_runtime"; 3491 my $guard = cf::lock_acquire "write_runtime";
3493 3492
3494 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3495 or return; 3494 or return;
3496 3495
3497 my $value = $cf::RUNTIME + 90 + 10; 3496 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3497 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3498 # 60 allows for the watchdog to kill the server.
3509 aio_utime $fh, undef, undef; 3508 aio_utime $fh, undef, undef;
3510 3509
3511 close $fh 3510 close $fh
3512 or return; 3511 or return;
3513 3512
3514 aio_rename "$runtime~", $runtime 3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3514 and return;
3516 3515
3517 warn "runtime file written.\n"; 3516 warn "runtime file written.\n";
3518 3517
3519 1 3518 1
3531 my $uuid = "$LOCALDIR/uuid"; 3530 my $uuid = "$LOCALDIR/uuid";
3532 3531
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3532 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return; 3533 or return;
3535 3534
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3535 my $value = uuid_seq uuid_cur;
3536
3537 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n";
3539 return;
3540 }
3541
3542 my $value = uuid_str $value + $uuid_skip;
3537 $uuid_skip = 0; 3543 $uuid_skip = 0;
3538 3544
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3545 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return; 3546 and return;
3541 3547
3563} 3569}
3564 3570
3565sub emergency_save() { 3571sub emergency_save() {
3566 my $freeze_guard = cf::freeze_mainloop; 3572 my $freeze_guard = cf::freeze_mainloop;
3567 3573
3568 warn "enter emergency perl save\n"; 3574 warn "emergency_perl_save: enter\n";
3569 3575
3570 cf::sync_job { 3576 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581
3571 # use a peculiar iteration method to avoid tripping on perl 3582 # use a peculiar iteration method to avoid tripping on perl
3572 # refcount bugs in for. also avoids problems with players 3583 # refcount bugs in for. also avoids problems with players
3573 # and maps saved/destroyed asynchronously. 3584 # and maps saved/destroyed asynchronously.
3574 warn "begin emergency player save\n"; 3585 warn "emergency_perl_save: begin player save\n";
3575 for my $login (keys %cf::PLAYER) { 3586 for my $login (keys %cf::PLAYER) {
3576 my $pl = $cf::PLAYER{$login} or next; 3587 my $pl = $cf::PLAYER{$login} or next;
3577 $pl->valid or next; 3588 $pl->valid or next;
3578 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3579 $pl->save; 3590 $pl->save;
3580 } 3591 }
3581 warn "end emergency player save\n"; 3592 warn "emergency_perl_save: end player save\n";
3582 3593
3583 warn "begin emergency map save\n"; 3594 warn "emergency_perl_save: begin map save\n";
3584 for my $path (keys %cf::MAP) { 3595 for my $path (keys %cf::MAP) {
3585 my $map = $cf::MAP{$path} or next; 3596 my $map = $cf::MAP{$path} or next;
3586 $map->valid or next; 3597 $map->valid or next;
3587 $map->save; 3598 $map->save;
3588 } 3599 }
3589 warn "end emergency map save\n"; 3600 warn "emergency_perl_save: end map save\n";
3590 3601
3591 warn "begin emergency database checkpoint\n"; 3602 warn "emergency_perl_save: begin database checkpoint\n";
3592 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3593 warn "end emergency database checkpoint\n"; 3604 warn "emergency_perl_save: end database checkpoint\n";
3594 3605
3595 warn "begin write uuid\n"; 3606 warn "emergency_perl_save: begin write uuid\n";
3596 write_uuid_sync 1; 3607 write_uuid_sync 1;
3597 warn "end write uuid\n"; 3608 warn "emergency_perl_save: end write uuid\n";
3598 }; 3609 };
3599 3610
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3600 warn "leave emergency perl save\n"; 3616 warn "emergency_perl_save: leave\n";
3601} 3617}
3602 3618
3603sub post_cleanup { 3619sub post_cleanup {
3604 my ($make_core) = @_; 3620 my ($make_core) = @_;
3605 3621
3606 warn Carp::longmess "post_cleanup backtrace" 3622 warn Carp::longmess "post_cleanup backtrace"
3607 if $make_core; 3623 if $make_core;
3624
3625 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$;
3608} 3627}
3609 3628
3610# a safer delete_package, copied from Symbol 3629# a safer delete_package, copied from Symbol
3611sub clear_package($) { 3630sub clear_package($) {
3612 my $pkg = shift; 3631 my $pkg = shift;
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) { 3648 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"}; 3649 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 } 3651 }
3633 warn "cleared package #$pkg\n";#d# 3652 warn "cleared package $pkg\n";#d#
3634} 3653}
3635
3636our $RELOAD; # how many times to reload
3637 3654
3638sub do_reload_perl() { 3655sub do_reload_perl() {
3639 # can/must only be called in main 3656 # can/must only be called in main
3640 if ($Coro::current != $Coro::main) { 3657 if ($Coro::current != $Coro::main) {
3641 warn "can only reload from main coroutine"; 3658 warn "can only reload from main coroutine";
3642 return; 3659 return;
3643 } 3660 }
3644 3661
3645 return if $RELOAD++; 3662 return if $RELOAD++;
3663
3664 my $t1 = EV::time;
3646 3665
3647 while ($RELOAD) { 3666 while ($RELOAD) {
3648 warn "reloading..."; 3667 warn "reloading...";
3649 3668
3650 warn "entering sync_job"; 3669 warn "entering sync_job";
3711 clear_package "safe::$_" 3730 clear_package "safe::$_"
3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3713 3732
3714 warn "unloading cf.pm \"a bit\""; 3733 warn "unloading cf.pm \"a bit\"";
3715 delete $INC{"cf.pm"}; 3734 delete $INC{"cf.pm"};
3716 delete $INC{"cf/pod.pm"}; 3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3717 3736
3718 # don't, removes xs symbols, too, 3737 # don't, removes xs symbols, too,
3719 # and global variables created in xs 3738 # and global variables created in xs
3720 #clear_package __PACKAGE__; 3739 #clear_package __PACKAGE__;
3721 3740
3729 cf::reload_config; 3748 cf::reload_config;
3730 3749
3731 warn "loading extensions"; 3750 warn "loading extensions";
3732 cf::load_extensions; 3751 cf::load_extensions;
3733 3752
3753 if ($REATTACH_ON_RELOAD) {
3734 warn "reattaching attachments to objects/players"; 3754 warn "reattaching attachments to objects/players";
3735 _global_reattach; # objects, sockets 3755 _global_reattach; # objects, sockets
3736 warn "reattaching attachments to maps"; 3756 warn "reattaching attachments to maps";
3737 reattach $_ for values %MAP; 3757 reattach $_ for values %MAP;
3738 warn "reattaching attachments to players"; 3758 warn "reattaching attachments to players";
3739 reattach $_ for values %PLAYER; 3759 reattach $_ for values %PLAYER;
3760 }
3761
3762 warn "running post_init jobs";
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3740 3764
3741 warn "leaving sync_job"; 3765 warn "leaving sync_job";
3742 3766
3743 1 3767 1
3744 } or do { 3768 } or do {
3747 }; 3771 };
3748 3772
3749 warn "reloaded"; 3773 warn "reloaded";
3750 --$RELOAD; 3774 --$RELOAD;
3751 } 3775 }
3776
3777 $t1 = EV::time - $t1;
3778 warn "reload completed in ${t1}s\n";
3752}; 3779};
3753 3780
3754our $RELOAD_WATCHER; # used only during reload 3781our $RELOAD_WATCHER; # used only during reload
3755 3782
3756sub reload_perl() { 3783sub reload_perl() {
3757 # doing reload synchronously and two reloads happen back-to-back, 3784 # doing reload synchronously and two reloads happen back-to-back,
3758 # coro crashes during coro_state_free->destroy here. 3785 # coro crashes during coro_state_free->destroy here.
3759 3786
3787 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions;
3789
3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3791 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3792 undef $RELOAD_WATCHER;
3793 };
3763 }; 3794 };
3764} 3795}
3765 3796
3766register_command "reload" => sub { 3797register_command "reload" => sub {
3767 my ($who, $arg) = @_; 3798 my ($who, $arg) = @_;
3893 $msg =~ s/\n//; 3924 $msg =~ s/\n//;
3894 3925
3895 # limit the # of concurrent backtraces 3926 # limit the # of concurrent backtraces
3896 if ($_log_backtrace < 2) { 3927 if ($_log_backtrace < 2) {
3897 ++$_log_backtrace; 3928 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg;
3898 async { 3930 async {
3899 $Coro::current->{desc} = "abt $msg"; 3931 $Coro::current->{desc} = "abt $msg";
3900 3932
3901 my @bt = fork_call { 3933 my @bt = fork_call {
3902 @addr = map { sprintf "%x", $_ } @addr; 3934 @addr = map { sprintf "%x", $_ } @addr;
3913 } 3945 }
3914 3946
3915 @funcs 3947 @funcs
3916 }; 3948 };
3917 3949
3918 LOG llevInfo, "[ABT] $msg\n"; 3950 LOG llevInfo, "[ABT] $perl_bt\n";
3951 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3919 LOG llevInfo, "[ABT] $_\n" for @bt; 3952 LOG llevInfo, "[ABT] $_\n" for @bt;
3920 --$_log_backtrace; 3953 --$_log_backtrace;
3921 }; 3954 };
3922 } else { 3955 } else {
3923 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $msg\n";
3924 LOG llevInfo, "[ABT] [suppressed]\n"; 3957 LOG llevInfo, "[ABT] [suppressed]\n";
3925 } 3958 }
3926} 3959}
3927 3960
3928# load additional modules 3961# load additional modules
3929use cf::pod; 3962require "cf/$_.pm" for @EXTRA_MODULES;
3930 3963
3931END { cf::emergency_save } 3964END { cf::emergency_save }
3932 3965
39331 39661
3934 3967

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines