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.502 by root, Sat Jan 23 20:24:50 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
… …
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 77
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %RESOURCE; 111our %RESOURCE;
98 112
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 115our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
103 117
104our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 121our $DB_ENV;
108 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
109our %CFG; 125our %CFG;
110 126
111our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 128our $RUNTIME;
113our $NOW; 129our $NOW;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 140our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
126 142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
147
127binmode STDOUT; 148binmode STDOUT;
128binmode STDERR; 149binmode STDERR;
129 150
130# read virtual server time, if available 151# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
135} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
136 159
137mkdir $_ 160mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 162
140our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
141 164
142sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
143 177
144############################################################################# 178#############################################################################
145 179
146=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
147 181
… …
194returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
195per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
196 230
197=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
198 232
199This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 235that call.
202 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
203=back 243=back
204 244
205=cut 245=cut
206 246
207BEGIN { 247$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 248 my $msg = join "", @_;
210 249
211 $msg .= "\n" 250 $msg .= "\n"
212 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
213 252
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 254
216 LOG llevError, $msg; 255 LOG llevError, $msg;
217 }; 256};
218}
219 257
220$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
222 262
223 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 265 return;#d#
226 }#d# 266 }#d#
227 267
228 # kill coroutine otherwise 268 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 269 Coro::terminate
231}; 270};
232
233$SIG{__DIE__} = sub { }; #d#?
234 271
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
252)) { 289)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 291}
255 292
256$EV::DIED = sub { 293$EV::DIED = sub {
257 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
258}; 295};
259 296
260############################################################################# 297#############################################################################
261 298
262=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 337
301sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
303 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
304=item cf::lock_wait $string 355=item cf::lock_wait $string
305 356
306Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
307 358
308=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
309 360
310Wait until the given lock is available and then acquires it and returns 361Wait 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, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
313returned. 364returned.
314 365
315Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 367deadlocked coro.
… …
322 373
323Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
324 375
325=cut 376=cut
326 377
327our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 379
330sub lock_wait($) { 380sub lock_wait($) {
331 my ($key) = @_; 381 $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} 382}
344 383
345sub lock_acquire($) { 384sub lock_acquire($) {
346 my ($key) = @_; 385 $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} 386}
360 387
361sub lock_active($) { 388sub lock_active($) {
362 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 390}
366 391
367sub freeze_mainloop { 392sub freeze_mainloop {
368 tick_inhibit_inc; 393 tick_inhibit_inc;
369 394
370 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
371} 396}
372 397
373=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
374 399
375Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
… …
398 423
399=cut 424=cut
400 425
401our @SLOT_QUEUE; 426our @SLOT_QUEUE;
402our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
403 429
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
407 433
408 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
409 436
410 while () { 437 while () {
411 next_job: 438 next_job:
439
412 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 441
414 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 446 $job->[2]->send;
418 Coro::cede; 447 Coro::cede;
419 goto next_job; 448 goto next_job;
420 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 451 }
422 } 452 }
423 453
424 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 457 $signal->wait;
428 } else { 458 } else {
459 $busy = 0;
429 Coro::schedule; 460 Coro::schedule;
430 } 461 }
431 } 462 }
432}; 463};
433 464
434sub get_slot($;$$) { 465sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
436 467
437 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
438 469
439 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
440 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
441 473
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
727 759
728############################################################################# 760#############################################################################
729 761
730=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
731 763
732Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
735 767
736In the following description, CLASS can be any of C<global>, C<object> 768In 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 769C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
788 820
789Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
791 823
792Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
794 826
795These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
796 828
797=over 4 829=over 4
… …
1147 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1148 1180
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1153 aio_close $fh; 1188 aio_close $fh;
1154 1189
1155 if (@$objs) { 1190 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1161 aio_close $fh; 1199 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1201 }
1164 } else { 1202 } else {
1165 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1166 } 1204 }
1167 1205
1168 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1210 } else {
1170 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1171 } 1212 }
1172 } else { 1213 } else {
1173 aio_unlink $filename; 1214 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1175 } 1216 }
… …
1266 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1267 1308
1268 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1269} 1310}
1270 1311
1312use File::Glob ();
1313
1271cf::player->attach ( 1314cf::player->attach (
1272 on_command => sub { 1315 on_command => sub {
1273 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1274 1317
1275 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1306 } 1349 }
1307 1350
1308 cf::override; 1351 cf::override;
1309 }, 1352 },
1310); 1353);
1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1311 1367
1312sub load_extensions { 1368sub load_extensions {
1313 cf::sync_job { 1369 cf::sync_job {
1314 my %todo; 1370 my %todo;
1315 1371
… …
1385 1441
1386=back 1442=back
1387 1443
1388=head2 CORE EXTENSIONS 1444=head2 CORE EXTENSIONS
1389 1445
1390Functions and methods that extend core crossfire objects. 1446Functions and methods that extend core deliantra objects.
1391 1447
1392=cut 1448=cut
1393 1449
1394package cf::player; 1450package cf::player;
1395 1451
… …
1438 1494
1439sub exists($) { 1495sub exists($) {
1440 my ($login) = @_; 1496 my ($login) = @_;
1441 1497
1442 $cf::PLAYER{$login} 1498 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1499 or !aio_stat path $login
1444} 1500}
1445 1501
1446sub find($) { 1502sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1503 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1504 my $login = $_[0];
… …
1523 my ($pl) = @_; 1579 my ($pl) = @_;
1524 1580
1525 my $name = $pl->ob->name; 1581 my $name = $pl->ob->name;
1526 1582
1527 $pl->{deny_save} = 1; 1583 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we nuked the dir 1584 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1585
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1587 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score; 1589 $pl->ob->check_score;
… …
1619 } 1675 }
1620 1676
1621 \@paths 1677 \@paths
1622} 1678}
1623 1679
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1680=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1681
1626Expand crossfire pod fragments into protocol xml. 1682Expand 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 1683
1719=item $player->ext_reply ($msgid, @msg) 1684=item $player->ext_reply ($msgid, @msg)
1720 1685
1721Sends an ext reply to the player. 1686Sends an ext reply to the player.
1722 1687
… …
1935 1900
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1901 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 1902 "$UNIQUEDIR/$path"
1938} 1903}
1939 1904
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 { 1905sub decay_objects {
1950 my ($self) = @_; 1906 my ($self) = @_;
1951 1907
1952 return if $self->{deny_reset}; 1908 return if $self->{deny_reset};
1953 1909
… …
2035sub find { 1991sub find {
2036 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
2037 1993
2038 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
2039 1995
2040 cf::lock_wait "map_data:$path";#d#remove 1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
2042 1998
2043 $cf::MAP{$path} || do { 1999 $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 2000 my $map = new_from_path cf::map $path
2048 or return; 2001 or return;
2049 2002
2050 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
2051 2004
… …
2063 2016
2064 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
2065 } 2018 }
2066} 2019}
2067 2020
2068sub pre_load { } 2021sub pre_load { }
2069sub post_load { } 2022#sub post_load { } # XS
2070 2023
2071sub load { 2024sub load {
2072 my ($self) = @_; 2025 my ($self) = @_;
2073 2026
2074 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
… …
2119 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2073 $self->decay_objects;
2121 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
2122 $self->update_buttons; 2075 $self->update_buttons;
2123 cf::cede_to_tick; 2076 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick;
2126 $self->activate; 2077 $self->activate;
2127 } 2078 }
2128 2079
2129 $self->{last_save} = $cf::RUNTIME; 2080 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME); 2081 $self->last_access ($cf::RUNTIME);
… …
2296 2247
2297 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2298 2249
2299 return if $self->players; 2250 return if $self->players;
2300 2251
2301 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
2302 2253
2303 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2304 2255
2305 # need to save uniques path 2256 # need to save uniques path
2306 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
… …
2397 : normalise $_ 2348 : normalise $_
2398 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2399 ] 2350 ]
2400} 2351}
2401 2352
2353=item cf::map::static_maps
2354
2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2358
2359=cut
2360
2361sub static_maps() {
2362 my @dirs = "";
2363 my @maps;
2364
2365 while (@dirs) {
2366 my $dir = shift @dirs;
2367
2368 next if $dir eq "/styles" || $dir eq "/editor";
2369
2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2371 or return;
2372
2373 for (@$files) {
2374 s/\.map$// or next;
2375 utf8::decode $_;
2376 push @maps, "$dir/$_";
2377 }
2378
2379 push @dirs, map "$dir/$_", @$dirs;
2380 }
2381
2382 \@maps
2383}
2384
2402=back 2385=back
2403 2386
2404=head3 cf::object 2387=head3 cf::object
2405 2388
2406=cut 2389=cut
… …
2471 2454
2472our $SAY_CHANNEL = { 2455our $SAY_CHANNEL = {
2473 id => "say", 2456 id => "say",
2474 title => "Map", 2457 title => "Map",
2475 reply => "say ", 2458 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2459 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2477}; 2460};
2478 2461
2479our $CHAT_CHANNEL = { 2462our $CHAT_CHANNEL = {
2480 id => "chat", 2463 id => "chat",
2481 title => "Chat", 2464 title => "Chat",
… …
2536 2519
2537=item $player_object->enter_link 2520=item $player_object->enter_link
2538 2521
2539Freezes the player and moves him/her to a special map (C<{link}>). 2522Freezes the player and moves him/her to a special map (C<{link}>).
2540 2523
2541The player should be reasonably safe there for short amounts of time. You 2524The player should be reasonably safe there for short amounts of time (e.g.
2542I<MUST> call C<leave_link> as soon as possible, though. 2525for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2526though, as the palyer cannot control the character while it is on the link
2527map.
2543 2528
2544Will never block. 2529Will never block.
2545 2530
2546=item $player_object->leave_link ($map, $x, $y) 2531=item $player_object->leave_link ($map, $x, $y)
2547 2532
… …
2599 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2600 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2601 2586
2602 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2603 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2604 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2605 2590
2606 $map->load; 2591 $map->load;
2607 $map->load_neighbours; 2592 $map->load_neighbours;
2608 2593
2609 return unless $self->contr->active; 2594 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2595
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2597 $self->enter_map ($map, $x, $y);
2598
2599 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive;
2614} 2601}
2615 2602
2616=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2617 2604
2618Moves the player to the given map-path and coordinates by first freezing 2605Moves the player to the given map-path and coordinates by first freezing
… …
2777 $self->contr->savebed ($map, $x, $y) 2764 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2765 if $exit->flag (cf::FLAG_DAMNED);
2779 2766
2780 1 2767 1
2781 }) { 2768 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2769 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "I'll try to bring you back to the map you were before. " 2770 . "I'll try to bring you back to the map you were before. "
2784 . "Please report this to the dungeon master!", 2771 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2772 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2773
2787 warn "ERROR in enter_exit: $@"; 2774 warn "ERROR in enter_exit: $@";
… …
2804sub cf::client::send_drawinfo { 2791sub cf::client::send_drawinfo {
2805 my ($self, $text, $flags) = @_; 2792 my ($self, $text, $flags) = @_;
2806 2793
2807 utf8::encode $text; 2794 utf8::encode $text;
2808 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2796}
2797
2798=item $client->send_big_packet ($pkt)
2799
2800Like C<send_packet>, but tries to compress large packets, and fragments
2801them as required.
2802
2803=cut
2804
2805our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2806
2807sub cf::client::send_big_packet {
2808 my ($self, $pkt) = @_;
2809
2810 # try lzf for large packets
2811 $pkt = "lzf " . Compress::LZF::compress $pkt
2812 if 1024 <= length $pkt and $self->{can_lzf};
2813
2814 # split very large packets
2815 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2816 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2817 $pkt = "frag";
2818 }
2819
2820 $self->send_packet ($pkt);
2809} 2821}
2810 2822
2811=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2812 2824
2813Send a drawinfo or msg packet to the client, formatting the msg for the 2825Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2817 2829
2818=cut 2830=cut
2819 2831
2820# non-persistent channels (usually the info channel) 2832# non-persistent channels (usually the info channel)
2821our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2822 "c/identify" => { 2840 "c/identify" => {
2823 id => "infobox", 2841 id => "infobox",
2824 title => "Identify", 2842 title => "Identify",
2825 reply => undef, 2843 reply => undef,
2826 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
… …
2828 "c/examine" => { 2846 "c/examine" => {
2829 id => "infobox", 2847 id => "infobox",
2830 title => "Examine", 2848 title => "Examine",
2831 reply => undef, 2849 reply => undef,
2832 tooltip => "Signs and other items you examined", 2850 tooltip => "Signs and other items you examined",
2851 },
2852 "c/shopinfo" => {
2853 id => "infobox",
2854 title => "Shop Info",
2855 reply => undef,
2856 tooltip => "What your bargaining skill tells you about the shop",
2833 }, 2857 },
2834 "c/book" => { 2858 "c/book" => {
2835 id => "infobox", 2859 id => "infobox",
2836 title => "Book", 2860 title => "Book",
2837 reply => undef, 2861 reply => undef,
… …
2853 id => "infobox", 2877 id => "infobox",
2854 title => "Body Parts", 2878 title => "Body Parts",
2855 reply => undef, 2879 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 2880 tooltip => "Shows which body parts you posess and are available",
2857 }, 2881 },
2882 "c/statistics" => {
2883 id => "infobox",
2884 title => "Statistics",
2885 reply => undef,
2886 tooltip => "Shows your primary statistics",
2887 },
2888 "c/skills" => {
2889 id => "infobox",
2890 title => "Skills",
2891 reply => undef,
2892 tooltip => "Shows your experience per skill and item power",
2893 },
2894 "c/shopitems" => {
2895 id => "infobox",
2896 title => "Shop Items",
2897 reply => undef,
2898 tooltip => "Shows the items currently for sale in this shop",
2899 },
2900 "c/resistances" => {
2901 id => "infobox",
2902 title => "Resistances",
2903 reply => undef,
2904 tooltip => "Shows your resistances",
2905 },
2906 "c/pets" => {
2907 id => "infobox",
2908 title => "Pets",
2909 reply => undef,
2910 tooltip => "Shows information abotu your pets/a specific pet",
2911 },
2912 "c/perceiveself" => {
2913 id => "infobox",
2914 title => "Perceive Self",
2915 reply => undef,
2916 tooltip => "You gained detailed knowledge about yourself",
2917 },
2858 "c/uptime" => { 2918 "c/uptime" => {
2859 id => "infobox", 2919 id => "infobox",
2860 title => "Uptime", 2920 title => "Uptime",
2861 reply => undef, 2921 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 2922 tooltip => "How long the server has been running since last restart",
… …
2871 id => "party", 2931 id => "party",
2872 title => "Party", 2932 title => "Party",
2873 reply => "gsay ", 2933 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 2934 tooltip => "Messages and chat related to your party",
2875 }, 2935 },
2936 "c/death" => {
2937 id => "death",
2938 title => "Death",
2939 reply => undef,
2940 tooltip => "Reason for and more info about your most recent death",
2941 },
2942 "c/say" => $SAY_CHANNEL,
2943 "c/chat" => $CHAT_CHANNEL,
2876); 2944);
2877 2945
2878sub cf::client::send_msg { 2946sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 2947 my ($self, $channel, $msg, $color, @extra) = @_;
2880 2948
2881 $msg = $self->pl->expand_cfpod ($msg); 2949 $msg = $self->pl->expand_cfpod ($msg)
2950 unless $color & cf::NDI_VERBATIM;
2882 2951
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 2952 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 2953
2885 # check predefined channels, for the benefit of C 2954 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 2955 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 2956 $channel = $CHANNEL{$channel};
2888 2957
2889 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 2959 $channel = $channel->{id};
2893 2960
2894 } elsif (ref $channel) { 2961 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 2962 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 2963 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 2964 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 2965 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 2966 }
2901 2967
2902 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2903 } 2969 }
2904 2970
2905 return unless @extra || length $msg; 2971 return unless @extra || length $msg;
2906 2972
2907 if ($self->can_msg) {
2908 # default colour, mask it out 2973 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2974 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 2975 if $color & cf::NDI_DEF;
2911 2976
2912 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2977 my $pkt = "msg "
2978 . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2914 } else { 2980 );
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 2981
2926 $color &= cf::NDI_COLOR_MASK; 2982 $self->send_big_packet ($pkt);
2927
2928 utf8::encode $msg;
2929
2930 if (0 && $msg =~ /\[/) {
2931 # COMMAND/INFO
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 }
2939} 2983}
2940 2984
2941=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2942 2986
2943Sends an ext event to the client. 2987Sends an ext event to the client.
… …
2946 2990
2947sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2948 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2949 2993
2950 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2952 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2953 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2954 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2955 } 2999 }
2956} 3000}
2957 3001
2958=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2959 3003
… …
2963 3007
2964sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2965 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2966 3010
2967 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2968 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2969 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2970 #TODO: version 1, remove 3014 #TODO: version 1, remove
2971 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2973 } 3017 }
2974} 3018}
2975 3019
2976=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2977 3021
… …
3104our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
3105 3149
3106$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
3107 3151
3108$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
3109 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
3110 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
3111 sort time 3155 sort time
3112)); 3156));
3113 3157
3114# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
… …
3118The following functions and methods are available within a safe environment: 3162The following functions and methods are available within a safe environment:
3119 3163
3120 cf::object 3164 cf::object
3121 contr pay_amount pay_player map x y force_find force_add destroy 3165 contr pay_amount pay_player map x y force_find force_add destroy
3122 insert remove name archname title slaying race decrease split 3166 insert remove name archname title slaying race decrease split
3167 value
3123 3168
3124 cf::object::player 3169 cf::object::player
3125 player 3170 player
3126 3171
3127 cf::player 3172 cf::player
… …
3133=cut 3178=cut
3134 3179
3135for ( 3180for (
3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3181 ["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 3182 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)], 3183 decrease split destroy change_exp value msg lore send_msg)],
3139 ["cf::object::player" => qw(player)], 3184 ["cf::object::player" => qw(player)],
3140 ["cf::player" => qw(peaceful)], 3185 ["cf::player" => qw(peaceful send_msg)],
3141 ["cf::map" => qw(trigger)], 3186 ["cf::map" => qw(trigger)],
3142) { 3187) {
3143 no strict 'refs'; 3188 no strict 'refs';
3144 my ($pkg, @funs) = @$_; 3189 my ($pkg, @funs) = @$_;
3145 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3163 3208
3164 my $qcode = $code; 3209 my $qcode = $code;
3165 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3166 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
3167 3212
3213 %vars = (_dummy => 0) unless %vars;
3214
3215 my @res;
3168 local $_; 3216 local $_;
3169 local @safe::cf::_safe_eval_args = values %vars;
3170 3217
3171 my $eval = 3218 my $eval =
3172 "do {\n" 3219 "do {\n"
3173 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3174 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
3175 . $code 3222 . $code
3176 . "\n}" 3223 . "\n}"
3177 ; 3224 ;
3178 3225
3226 if ($CFG{safe_eval}) {
3179 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
3180 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3181 sub_generation_inc; 3230 sub_generation_inc;
3231 } else {
3232 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval;
3234 }
3182 3235
3183 if ($@) { 3236 if ($@) {
3184 warn "$@"; 3237 warn "$@";
3185 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
3186 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
3205=cut 3258=cut
3206 3259
3207sub register_script_function { 3260sub register_script_function {
3208 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
3209 3262
3210 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
3211 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
3212} 3265}
3213 3266
3214=back 3267=back
3215 3268
3216=cut 3269=cut
… …
3237 3290
3238 $facedata->{version} == 2 3291 $facedata->{version} == 2
3239 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3240 3293
3241 # patch in the exptable 3294 # patch in the exptable
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3242 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3243 type => FT_RSRC, 3297 type => FT_RSRC,
3244 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3298 data => $exp_table,
3299 hash => (Digest::MD5::md5 $exp_table),
3245 }; 3300 };
3246 cf::cede_to_tick; 3301 cf::cede_to_tick;
3247 3302
3248 { 3303 {
3249 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
… …
3251 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3252 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253 3308
3254 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3255 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3258 3313
3259 cf::cede_to_tick; 3314 cf::cede_to_tick;
3260 } 3315 }
3261 3316
3262 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
… …
3286 3341
3287 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3288 } 3343 }
3289 3344
3290 { 3345 {
3291 # TODO: for gcfclient pleasure, we should give resources
3292 # that gcfclient doesn't grok a >10000 face index.
3293 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3294 3347
3295 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) { 3349 if (defined $info->{type}) {
3297 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3298 my $data;
3299 3351
3300 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3301 # prepend meta info
3302
3303 my $meta = $enc->encode ({
3304 name => $name,
3305 %{ $info->{meta} || {} },
3306 });
3307
3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type}; 3353 cf::face::set_type $idx, $info->{type};
3315 } else { 3354 } else {
3316 $RESOURCE{$name} = $info; 3355 $RESOURCE{$name} = $info;
3317 } 3356 }
3318 3357
… …
3401 reload_treasures; 3440 reload_treasures;
3402 3441
3403 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3404} 3443}
3405 3444
3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 reload_resources;
3412}
3413
3414sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3415 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3416 or return; 3449 or return;
3417 3450
3418 local $/; 3451 local $/;
3419 *CFG = YAML::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3420 3453
3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3422 3455
3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3428 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3429 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3430 }; 3463 };
3431 warn $@ if $@; 3464 warn $@ if $@;
3432 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3468}
3469
3470sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!";
3473 flock $fh, &Fcntl::LOCK_EX
3474 or die "$PIDFILE: flock: $!";
3475 $fh
3476}
3477
3478# make sure only one server instance is running at any one time
3479sub atomic {
3480 my $fh = pidfile;
3481
3482 my $pid = <$fh>;
3483 kill 9, $pid if $pid > 0;
3484
3485 seek $fh, 0, 0;
3486 print $fh $$;
3487}
3488
3489sub main_loop {
3490 warn "EV::loop starting\n";
3491 if (1) {
3492 EV::loop;
3493 }
3494 warn "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP;
3433} 3496}
3434 3497
3435sub main { 3498sub main {
3499 cf::init_globals; # initialise logging
3500
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512
3436 # we must not ever block the main coroutine 3513 # we must not ever block the main coroutine
3437 local $Coro::idle = sub { 3514 local $Coro::idle = sub {
3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3439 (async { 3516 (async {
3440 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3517 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT; 3518 EV::loop EV::LOOP_ONESHOT;
3442 })->prio (Coro::PRIO_MAX); 3519 })->prio (Coro::PRIO_MAX);
3443 }; 3520 };
3444 3521
3445 { 3522 evthread_start IO::AIO::poll_fileno;
3446 my $guard = freeze_mainloop; 3523
3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3528 reload_resources;
3447 reload_config; 3529 reload_config;
3448 db_init; 3530 db_init;
3531
3532 cf::init_uuid;
3533 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills;
3536
3537 cf::init_beforeplay;
3538
3539 atomic;
3540
3449 load_extensions; 3541 load_extensions;
3450 3542
3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3543 utime time, time, $RUNTIMEFILE;
3544
3545 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548
3549 (pop @POST_INIT)->(0) while @POST_INIT;
3452 } 3550 };
3453 3551
3454 EV::loop; 3552 main_loop;
3455} 3553}
3456 3554
3457############################################################################# 3555#############################################################################
3458# initialisation and cleanup 3556# initialisation and cleanup
3459 3557
… …
3466 }; 3564 };
3467 } 3565 }
3468} 3566}
3469 3567
3470sub write_runtime_sync { 3568sub write_runtime_sync {
3471 my $runtime = "$LOCALDIR/runtime";
3472
3473 # first touch the runtime file to show we are still running: 3569 # first touch the runtime file to show we are still running:
3474 # the fsync below can take a very very long time. 3570 # the fsync below can take a very very long time.
3475 3571
3476 IO::AIO::aio_utime $runtime, undef, undef; 3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3477 3573
3478 my $guard = cf::lock_acquire "write_runtime"; 3574 my $guard = cf::lock_acquire "write_runtime";
3479 3575
3480 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3481 or return; 3577 or return;
3482 3578
3483 my $value = $cf::RUNTIME + 90 + 10; 3579 my $value = $cf::RUNTIME + 90 + 10;
3484 # 10 is the runtime save interval, for a monotonic clock 3580 # 10 is the runtime save interval, for a monotonic clock
3485 # 60 allows for the watchdog to kill the server. 3581 # 60 allows for the watchdog to kill the server.
… …
3495 aio_utime $fh, undef, undef; 3591 aio_utime $fh, undef, undef;
3496 3592
3497 close $fh 3593 close $fh
3498 or return; 3594 or return;
3499 3595
3500 aio_rename "$runtime~", $runtime 3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3501 and return; 3597 and return;
3502 3598
3503 warn "runtime file written.\n"; 3599 warn "runtime file written.\n";
3504 3600
3505 1 3601 1
… …
3517 my $uuid = "$LOCALDIR/uuid"; 3613 my $uuid = "$LOCALDIR/uuid";
3518 3614
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3615 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return; 3616 or return;
3521 3617
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3618 my $value = uuid_seq uuid_cur;
3619
3620 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n";
3622 return;
3623 }
3624
3625 my $value = uuid_str $value + $uuid_skip;
3523 $uuid_skip = 0; 3626 $uuid_skip = 0;
3524 3627
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3628 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return; 3629 and return;
3527 3630
… …
3549} 3652}
3550 3653
3551sub emergency_save() { 3654sub emergency_save() {
3552 my $freeze_guard = cf::freeze_mainloop; 3655 my $freeze_guard = cf::freeze_mainloop;
3553 3656
3554 warn "enter emergency perl save\n"; 3657 warn "emergency_perl_save: enter\n";
3555 3658
3556 cf::sync_job { 3659 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664
3557 # use a peculiar iteration method to avoid tripping on perl 3665 # use a peculiar iteration method to avoid tripping on perl
3558 # refcount bugs in for. also avoids problems with players 3666 # refcount bugs in for. also avoids problems with players
3559 # and maps saved/destroyed asynchronously. 3667 # and maps saved/destroyed asynchronously.
3560 warn "begin emergency player save\n"; 3668 warn "emergency_perl_save: begin player save\n";
3561 for my $login (keys %cf::PLAYER) { 3669 for my $login (keys %cf::PLAYER) {
3562 my $pl = $cf::PLAYER{$login} or next; 3670 my $pl = $cf::PLAYER{$login} or next;
3563 $pl->valid or next; 3671 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3565 $pl->save; 3673 $pl->save;
3566 } 3674 }
3567 warn "end emergency player save\n"; 3675 warn "emergency_perl_save: end player save\n";
3568 3676
3569 warn "begin emergency map save\n"; 3677 warn "emergency_perl_save: begin map save\n";
3570 for my $path (keys %cf::MAP) { 3678 for my $path (keys %cf::MAP) {
3571 my $map = $cf::MAP{$path} or next; 3679 my $map = $cf::MAP{$path} or next;
3572 $map->valid or next; 3680 $map->valid or next;
3573 $map->save; 3681 $map->save;
3574 } 3682 }
3575 warn "end emergency map save\n"; 3683 warn "emergency_perl_save: end map save\n";
3576 3684
3577 warn "begin emergency database checkpoint\n"; 3685 warn "emergency_perl_save: begin database checkpoint\n";
3578 BDB::db_env_txn_checkpoint $DB_ENV; 3686 BDB::db_env_txn_checkpoint $DB_ENV;
3579 warn "end emergency database checkpoint\n"; 3687 warn "emergency_perl_save: end database checkpoint\n";
3580 3688
3581 warn "begin write uuid\n"; 3689 warn "emergency_perl_save: begin write uuid\n";
3582 write_uuid_sync 1; 3690 write_uuid_sync 1;
3583 warn "end write uuid\n"; 3691 warn "emergency_perl_save: end write uuid\n";
3584 }; 3692 };
3585 3693
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3586 warn "leave emergency perl save\n"; 3699 warn "emergency_perl_save: leave\n";
3587} 3700}
3588 3701
3589sub post_cleanup { 3702sub post_cleanup {
3590 my ($make_core) = @_; 3703 my ($make_core) = @_;
3591 3704
3592 warn Carp::longmess "post_cleanup backtrace" 3705 warn Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3706 if $make_core;
3707
3708 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$;
3594} 3710}
3595 3711
3596# a safer delete_package, copied from Symbol 3712# a safer delete_package, copied from Symbol
3597sub clear_package($) { 3713sub clear_package($) {
3598 my $pkg = shift; 3714 my $pkg = shift;
… …
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) { 3731 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"}; 3732 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 } 3734 }
3619 warn "cleared package #$pkg\n";#d# 3735 warn "cleared package $pkg\n";#d#
3620} 3736}
3621
3622our $RELOAD; # how many times to reload
3623 3737
3624sub do_reload_perl() { 3738sub do_reload_perl() {
3625 # can/must only be called in main 3739 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3740 if ($Coro::current != $Coro::main) {
3627 warn "can only reload from main coroutine"; 3741 warn "can only reload from main coroutine";
3628 return; 3742 return;
3629 } 3743 }
3630 3744
3631 return if $RELOAD++; 3745 return if $RELOAD++;
3746
3747 my $t1 = EV::time;
3632 3748
3633 while ($RELOAD) { 3749 while ($RELOAD) {
3634 warn "reloading..."; 3750 warn "reloading...";
3635 3751
3636 warn "entering sync_job"; 3752 warn "entering sync_job";
… …
3697 clear_package "safe::$_" 3813 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3815
3700 warn "unloading cf.pm \"a bit\""; 3816 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3817 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3819
3704 # don't, removes xs symbols, too, 3820 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3821 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3822 #clear_package __PACKAGE__;
3707 3823
3708 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3709 3825
3710 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3711 require cf; 3827 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3713 3829
3714 warn "loading config and database again"; 3830 warn "loading config and database again";
3715 cf::reload_config; 3831 cf::reload_config;
3716 3832
3717 warn "loading extensions"; 3833 warn "loading extensions";
3718 cf::load_extensions; 3834 cf::load_extensions;
3719 3835
3836 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3837 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3838 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3839 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3840 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3841 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3842 reattach $_ for values %PLAYER;
3843 }
3844
3845 warn "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3726 3847
3727 warn "leaving sync_job"; 3848 warn "leaving sync_job";
3728 3849
3729 1 3850 1
3730 } or do { 3851 } or do {
… …
3733 }; 3854 };
3734 3855
3735 warn "reloaded"; 3856 warn "reloaded";
3736 --$RELOAD; 3857 --$RELOAD;
3737 } 3858 }
3859
3860 $t1 = EV::time - $t1;
3861 warn "reload completed in ${t1}s\n";
3738}; 3862};
3739 3863
3740our $RELOAD_WATCHER; # used only during reload 3864our $RELOAD_WATCHER; # used only during reload
3741 3865
3742sub reload_perl() { 3866sub reload_perl() {
3743 # doing reload synchronously and two reloads happen back-to-back, 3867 # doing reload synchronously and two reloads happen back-to-back,
3744 # coro crashes during coro_state_free->destroy here. 3868 # coro crashes during coro_state_free->destroy here.
3745 3869
3870 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions;
3872
3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3747 do_reload_perl; 3874 do_reload_perl;
3748 undef $RELOAD_WATCHER; 3875 undef $RELOAD_WATCHER;
3876 };
3749 }; 3877 };
3750} 3878}
3751 3879
3752register_command "reload" => sub { 3880register_command "reload" => sub {
3753 my ($who, $arg) = @_; 3881 my ($who, $arg) = @_;
… …
3767 3895
3768our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3769our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3770 3898
3771sub wait_for_tick { 3899sub wait_for_tick {
3772 return if tick_inhibit || $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3773 3901
3774 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3775 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3776 $signal->wait; 3904 $signal->wait;
3777} 3905}
3778 3906
3779sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 3909
3782 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3784 $signal->wait; 3912 $signal->wait;
3785} 3913}
… …
3790 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3791 return; 3919 return;
3792 } 3920 }
3793 3921
3794 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3923
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3795 3925
3796 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3798 Coro::async_pool { 3928 Coro::async_pool {
3799 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";
… …
3879 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3880 4010
3881 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3882 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3883 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3884 async { 4015 async {
3885 $Coro::current->{desc} = "abt $msg"; 4016 $Coro::current->{desc} = "abt $msg";
3886 4017
3887 my @bt = fork_call { 4018 my @bt = fork_call {
3888 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
… …
3899 } 4030 }
3900 4031
3901 @funcs 4032 @funcs
3902 }; 4033 };
3903 4034
3904 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3905 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3906 --$_log_backtrace; 4038 --$_log_backtrace;
3907 }; 4039 };
3908 } else { 4040 } else {
3909 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3910 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3911 } 4043 }
3912} 4044}
3913 4045
3914# load additional modules 4046# load additional modules
3915use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3916 4049
3917END { cf::emergency_save } 4050END { cf::emergency_save }
3918 4051
39191 40521
3920 4053

Diff Legend

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