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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.505 by root, Sun Jan 31 03:46:20 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,2009,2010 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
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$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" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 115our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
99 117
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 121our $DB_ENV;
105 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
106our %CFG; 125our %CFG;
107 126
108our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 128our $RUNTIME;
110our $NOW; 129our $NOW;
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 140our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
123 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
124binmode STDOUT; 148binmode STDOUT;
125binmode STDERR; 149binmode STDERR;
126 150
127# read virtual server time, if available 151# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
132} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
133 159
134mkdir $_ 160mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 162
137our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
138 164
139sub 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::"} };
140 177
141############################################################################# 178#############################################################################
142 179
143=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
144 181
… …
191returns 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
192per 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.
193 230
194=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
195 232
196This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 235that call.
199 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
200=back 243=back
201 244
202=cut 245=cut
203 246
204BEGIN { 247$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 248 my $msg = join "", @_;
207 249
208 $msg .= "\n" 250 $msg .= "\n"
209 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
210 252
211 $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;
212 254
213 LOG llevError, $msg; 255 LOG llevError, $msg;
214 }; 256};
215}
216 257
217$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
219 262
220 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 265 return;#d#
223 }#d# 266 }#d#
224 267
225 # kill coroutine otherwise 268 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 269 Coro::terminate
228}; 270};
229
230$SIG{__DIE__} = sub { }; #d#?
231 271
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
242for my $pkg (qw( 282for my $pkg (qw(
243 cf::global cf::attachable 283 cf::global cf::attachable
244 cf::object cf::object::player 284 cf::object cf::object::player
245 cf::client cf::player 285 cf::client cf::player
246 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
247 cf::map cf::party cf::region 288 cf::party cf::region
248)) { 289)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 291}
252 292
253$EV::DIED = sub { 293$EV::DIED = sub {
254 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
255}; 295};
256 296
257############################################################################# 297#############################################################################
258 298
259=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
296our $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
297 337
298sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 355=item cf::lock_wait $string
302 356
303Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
304 358
305=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
306 360
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
310returned. 364returned.
311 365
312Locks 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
313deadlocked coro. 367deadlocked coro.
… …
319 373
320Return 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.
321 375
322=cut 376=cut
323 377
324our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 379
327sub lock_wait($) { 380sub lock_wait($) {
328 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 382}
341 383
342sub lock_acquire($) { 384sub lock_acquire($) {
343 my ($key) = @_; 385 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 386}
357 387
358sub lock_active($) { 388sub lock_active($) {
359 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 390}
363 391
364sub freeze_mainloop { 392sub freeze_mainloop {
365 tick_inhibit_inc; 393 tick_inhibit_inc;
366 394
367 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
368} 396}
369 397
370=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
371 399
372Like 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
… …
395 423
396=cut 424=cut
397 425
398our @SLOT_QUEUE; 426our @SLOT_QUEUE;
399our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
400 429
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
404 433
405 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
406 436
407 while () { 437 while () {
408 next_job: 438 next_job:
439
409 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 441
411 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 446 $job->[2]->send;
415 Coro::cede; 447 Coro::cede;
416 goto next_job; 448 goto next_job;
417 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 451 }
419 } 452 }
420 453
421 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 457 $signal->wait;
425 } else { 458 } else {
459 $busy = 0;
426 Coro::schedule; 460 Coro::schedule;
427 } 461 }
428 } 462 }
429}; 463};
430 464
431sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
432 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
433 469
434 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
435 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
436 473
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
547 reset_signals; 584 reset_signals;
548 &$cb 585 &$cb
549 }, @args; 586 }, @args;
550 587
551 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
589}
590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
552} 616}
553 617
554=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
555 619
556Returns a single value from the environment database. 620Returns a single value from the environment database.
… …
695 759
696############################################################################# 760#############################################################################
697 761
698=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
699 763
700Many 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
701attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
703 767
704In 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>
705C<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
… …
755=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
756 820
757Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
759 823
760Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
761that 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.
762 826
763These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
764 828
765=over 4 829=over 4
… …
1056 1120
1057sub reattach { 1121sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1123 my ($obj) = @_;
1060 1124
1125 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1127
1063 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1064 1129
1065 @$registry = (); 1130 @$registry = ();
1066 1131
… …
1112 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1115 1180
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 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 }
1120 close $fh; 1188 aio_close $fh;
1121 1189
1122 if (@$objs) { 1190 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1127 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 }
1128 close $fh; 1199 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1201 }
1131 } else { 1202 } else {
1132 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1133 } 1204 }
1134 1205
1135 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1210 } else {
1137 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1138 } 1212 }
1139 } else { 1213 } else {
1140 aio_unlink $filename; 1214 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1142 } 1216 }
… …
1233 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1234 1308
1235 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1236} 1310}
1237 1311
1312use File::Glob ();
1313
1238cf::player->attach ( 1314cf::player->attach (
1239 on_command => sub { 1315 on_command => sub {
1240 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1241 1317
1242 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1274 1350
1275 cf::override; 1351 cf::override;
1276 }, 1352 },
1277); 1353);
1278 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}
1367
1279sub load_extensions { 1368sub load_extensions {
1280 cf::sync_job { 1369 cf::sync_job {
1281 my %todo; 1370 my %todo;
1282 1371
1283 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1302 1391
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1394
1306 $ext{source} = 1395 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1309 . $source 1398 . $source
1310 . "\n};\n1"; 1399 . "\n};\n1";
1311 1400
1312 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1313 } 1402 }
1314 1403
1404 my $pass = 0;
1315 my %done; 1405 my %done;
1316 while (%todo) { 1406 while (%todo) {
1317 my $progress; 1407 my $progress;
1318 1408
1409 ++$pass;
1410
1411 ext:
1319 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1414 next ext
1322 unless exists $done{$_}; 1415 unless exists $done{$_};
1323 } 1416 }
1324 1417
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1419
1327 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n";
1330 1424
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1426 if exists $v->{meta}{mandatory};
1335 1427 } else {
1336 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1337 } 1434 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1435 }
1343 1436
1344 skip: 1437 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1347 } 1445 }
1348 }; 1446 };
1349} 1447}
1350 1448
1351############################################################################# 1449#############################################################################
1352 1450
1353=back 1451=back
1354 1452
1355=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1356 1454
1357Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1358 1456
1359=cut 1457=cut
1360 1458
1361package cf::player; 1459package cf::player;
1362 1460
… …
1405 1503
1406sub exists($) { 1504sub exists($) {
1407 my ($login) = @_; 1505 my ($login) = @_;
1408 1506
1409 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1411} 1509}
1412 1510
1413sub find($) { 1511sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1513 my $login = $_[0];
… …
1427 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1526 or return;
1429 1527
1430 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1431 or return; 1529 or return;
1530
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1435 } 1534 }
1436 } 1535 }
… …
1446 1545
1447 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1448 1547
1449 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1550
1551 cf::get_slot 0.01;
1451 1552
1452 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1554 cf::cede_to_tick;
1454} 1555}
1455 1556
… …
1487 my ($pl) = @_; 1588 my ($pl) = @_;
1488 1589
1489 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1490 1591
1491 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1594
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1498 1601
1499 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1539 1642
1540 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1541 my $path = path $login; 1644 my $path = path $login;
1542 1645
1543 # a .pst is a dead give-away for a valid player 1646 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1652 }
1549 1653
… …
1580 } 1684 }
1581 1685
1582 \@paths 1686 \@paths
1583} 1687}
1584 1688
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1690
1587Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1692
1678=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1679 1694
1680Sends an ext reply to the player. 1695Sends an ext reply to the player.
1681 1696
… …
1748our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1750 1765
1751sub generate_random_map { 1766sub generate_random_map {
1752 my ($self, $rmp) = @_; 1767 my ($self, $rmp) = @_;
1768
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770
1753 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1772 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1897
1880# the temporary/swap location 1898# the temporary/swap location
1881sub save_path { 1899sub save_path {
1882 my ($self) = @_; 1900 my ($self) = @_;
1883 1901
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1886} 1904}
1887 1905
1888# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1889sub uniq_path { 1907sub uniq_path {
1890 my ($self) = @_; 1908 my ($self) = @_;
1891 1909
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 1912}
1904 1913
1905sub decay_objects { 1914sub decay_objects {
1906 my ($self) = @_; 1915 my ($self) = @_;
1907 1916
… …
1991sub find { 2000sub find {
1992 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1993 2002
1994 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1995 2004
1996 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2007
1999 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
2004 or return; 2010 or return;
2005 2011
2006 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
2007 2013
… …
2009 or return; 2015 or return;
2010 2016
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
2014 undef $guard1; 2021 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2022 $map->reset;
2017 return find $path; 2023 return find $path;
2018 } 2024 }
2019 2025
2020 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2021 } 2027 }
2022} 2028}
2023 2029
2024sub pre_load { } 2030sub pre_load { }
2025sub post_load { } 2031#sub post_load { } # XS
2026 2032
2027sub load { 2033sub load {
2028 my ($self) = @_; 2034 my ($self) = @_;
2029 2035
2030 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2054 $f->skip_block;
2049 $self->_load_objects ($f) 2055 $self->_load_objects ($f)
2050 or return; 2056 or return;
2051 2057
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
2053 if delete $self->{load_original}; 2059 if delete $self->{load_original};
2054 2060
2055 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2062 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2063 unless (aio_stat $uniq) {
… …
2075 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2082 $self->decay_objects;
2077 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2078 $self->update_buttons; 2084 $self->update_buttons;
2079 cf::cede_to_tick; 2085 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2086 $self->activate;
2083 } 2087 }
2084 2088
2085 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
2087 2091
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2093 }
2090 2094
2091 $self->post_load; 2095 $self->post_load;
2092} 2096}
2093 2097
… …
2151 my ($path, $origin, $load) = @_; 2155 my ($path, $origin, $load) = @_;
2152 2156
2153 $path = normalise $path, $origin && $origin->{path}; 2157 $path = normalise $path, $origin && $origin->{path};
2154 2158
2155 if (my $map = $cf::MAP{$path}) { 2159 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2161 }
2158 2162
2159 $MAP_PREFETCH{$path} |= $load; 2163 $MAP_PREFETCH{$path} |= $load;
2160 2164
2161 $MAP_PREFETCHER ||= cf::async { 2165 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2202 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2203 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2204 $_->contr->save for $self->players;
2201 }; 2205 };
2202 2206
2207 cf::get_slot 0.02;
2208
2203 if ($uniq) { 2209 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2210 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2211 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2212 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2215 $self->save; 2221 $self->save;
2216 2222
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2224
2219 return if $self->players; 2225 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2226 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2227 return if $self->{deny_save};
2222 2228
2223 $self->in_memory (cf::MAP_SWAPPED); 2229 $self->in_memory (cf::MAP_SWAPPED);
2224 2230
2225 $self->deactivate; 2231 $self->deactivate;
… …
2250 2256
2251 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252 2258
2253 return if $self->players; 2259 return if $self->players;
2254 2260
2255 warn "resetting map ", $self->path; 2261 warn "resetting map ", $self->path, "\n";
2256 2262
2257 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2258 2264
2259 # need to save uniques path 2265 # need to save uniques path
2260 unless ($self->{deny_save}) { 2266 unless ($self->{deny_save}) {
… …
2343 2349
2344sub unique_maps() { 2350sub unique_maps() {
2345 [ 2351 [
2346 map { 2352 map {
2347 utf8::decode $_; 2353 utf8::decode $_;
2348 /\.map$/ 2354 s/\.map$//; # TODO future compatibility hack
2355 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2356 ? ()
2349 ? normalise $_ 2357 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2359 ]
2353} 2360}
2354 2361
2355package cf; 2362=item cf::map::static_maps
2363
2364Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2365file in the shared directory excluding F</styles> and F</editor>). May
2366block.
2367
2368=cut
2369
2370sub static_maps() {
2371 my @dirs = "";
2372 my @maps;
2373
2374 while (@dirs) {
2375 my $dir = shift @dirs;
2376
2377 next if $dir eq "/styles" || $dir eq "/editor";
2378
2379 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2380 or return;
2381
2382 for (@$files) {
2383 s/\.map$// or next;
2384 utf8::decode $_;
2385 push @maps, "$dir/$_";
2386 }
2387
2388 push @dirs, map "$dir/$_", @$dirs;
2389 }
2390
2391 \@maps
2392}
2356 2393
2357=back 2394=back
2358 2395
2359=head3 cf::object 2396=head3 cf::object
2360 2397
… …
2364 2401
2365=over 4 2402=over 4
2366 2403
2367=item $ob->inv_recursive 2404=item $ob->inv_recursive
2368 2405
2369Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2370 2408
2371=cut 2409=cut
2372 2410
2373sub inv_recursive_; 2411sub inv_recursive_;
2374sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2380} 2418}
2381 2419
2382=item $ref = $ob->ref 2420=item $ref = $ob->ref
2383 2421
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2385 2423
2386=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2387 2425
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2427even if the object actually exists. May block.
… …
2421can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2460dialogue with the given NPC character.
2423 2461
2424=cut 2462=cut
2425 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2426# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2479# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2495
2444 } else { 2496 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2499 }
2448 } 2500 }
2449} 2501}
2450 2502
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2476 2528
2477=item $player_object->enter_link 2529=item $player_object->enter_link
2478 2530
2479Freezes the player and moves him/her to a special map (C<{link}>). 2531Freezes the player and moves him/her to a special map (C<{link}>).
2480 2532
2481The player should be reasonably safe there for short amounts of time. You 2533The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2534for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link
2536map.
2483 2537
2484Will never block. 2538Will never block.
2485 2539
2486=item $player_object->leave_link ($map, $x, $y) 2540=item $player_object->leave_link ($map, $x, $y)
2487 2541
… …
2539 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2541 2595
2542 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2545 2599
2546 $map->load; 2600 $map->load;
2547 $map->load_neighbours; 2601 $map->load_neighbours;
2548 2602
2549 return unless $self->contr->active; 2603 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2604
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2606 $self->enter_map ($map, $x, $y);
2607
2608 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive;
2554} 2610}
2555 2611
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2557 2613
2558Moves the player to the given map-path and coordinates by first freezing 2614Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2616that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2617the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2618be called at the end of this process.
2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2563 2622
2564=cut 2623=cut
2565 2624
2566our $GOTOGEN; 2625our $GOTOGEN;
2567 2626
… …
2646} 2705}
2647 2706
2648sub prepare_random_map { 2707sub prepare_random_map {
2649 my ($exit) = @_; 2708 my ($exit) = @_;
2650 2709
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2712 # that depends on the exit object
2656 2713
2657 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2716 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2664 } 2723 }
2665 2724
2666 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2667 2726
2668 my $data = cf::encode_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2671 2730
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2733 undef $fh;
2675 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2676 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2679 } 2742 }
2680} 2743}
2681 2744
2682sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2684 2747
2685 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2686 2749
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2750 $self->enter_link;
2699 2751
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2752 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2753 $Coro::current->{desc} = "enter_exit";
2706 2754
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2709 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2710 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2711 1; 2776 1
2712 }) { 2777 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2782
2718 warn "ERROR in enter_exit: $@"; 2783 warn "ERROR in enter_exit: $@";
… …
2735sub cf::client::send_drawinfo { 2800sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2801 my ($self, $text, $flags) = @_;
2737 2802
2738 utf8::encode $text; 2803 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2805}
2806
2807=item $client->send_big_packet ($pkt)
2808
2809Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required.
2811
2812=cut
2813
2814our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2815
2816sub cf::client::send_big_packet {
2817 my ($self, $pkt) = @_;
2818
2819 # try lzf for large packets
2820 $pkt = "lzf " . Compress::LZF::compress $pkt
2821 if 1024 <= length $pkt and $self->{can_lzf};
2822
2823 # split very large packets
2824 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2825 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2826 $pkt = "frag";
2827 }
2828
2829 $self->send_packet ($pkt);
2740} 2830}
2741 2831
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2833
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2834Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2748 2838
2749=cut 2839=cut
2750 2840
2751# non-persistent channels (usually the info channel) 2841# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2753 "c/identify" => { 2849 "c/identify" => {
2754 id => "infobox", 2850 id => "infobox",
2755 title => "Identify", 2851 title => "Identify",
2756 reply => undef, 2852 reply => undef,
2757 tooltip => "Items recently identified", 2853 tooltip => "Items recently identified",
… …
2759 "c/examine" => { 2855 "c/examine" => {
2760 id => "infobox", 2856 id => "infobox",
2761 title => "Examine", 2857 title => "Examine",
2762 reply => undef, 2858 reply => undef,
2763 tooltip => "Signs and other items you examined", 2859 tooltip => "Signs and other items you examined",
2860 },
2861 "c/shopinfo" => {
2862 id => "infobox",
2863 title => "Shop Info",
2864 reply => undef,
2865 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2866 },
2765 "c/book" => { 2867 "c/book" => {
2766 id => "infobox", 2868 id => "infobox",
2767 title => "Book", 2869 title => "Book",
2768 reply => undef, 2870 reply => undef,
… …
2784 id => "infobox", 2886 id => "infobox",
2785 title => "Body Parts", 2887 title => "Body Parts",
2786 reply => undef, 2888 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2889 tooltip => "Shows which body parts you posess and are available",
2788 }, 2890 },
2891 "c/statistics" => {
2892 id => "infobox",
2893 title => "Statistics",
2894 reply => undef,
2895 tooltip => "Shows your primary statistics",
2896 },
2897 "c/skills" => {
2898 id => "infobox",
2899 title => "Skills",
2900 reply => undef,
2901 tooltip => "Shows your experience per skill and item power",
2902 },
2903 "c/shopitems" => {
2904 id => "infobox",
2905 title => "Shop Items",
2906 reply => undef,
2907 tooltip => "Shows the items currently for sale in this shop",
2908 },
2909 "c/resistances" => {
2910 id => "infobox",
2911 title => "Resistances",
2912 reply => undef,
2913 tooltip => "Shows your resistances",
2914 },
2915 "c/pets" => {
2916 id => "infobox",
2917 title => "Pets",
2918 reply => undef,
2919 tooltip => "Shows information abotu your pets/a specific pet",
2920 },
2921 "c/perceiveself" => {
2922 id => "infobox",
2923 title => "Perceive Self",
2924 reply => undef,
2925 tooltip => "You gained detailed knowledge about yourself",
2926 },
2789 "c/uptime" => { 2927 "c/uptime" => {
2790 id => "infobox", 2928 id => "infobox",
2791 title => "Uptime", 2929 title => "Uptime",
2792 reply => undef, 2930 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2931 tooltip => "How long the server has been running since last restart",
… …
2796 id => "infobox", 2934 id => "infobox",
2797 title => "Map Info", 2935 title => "Map Info",
2798 reply => undef, 2936 reply => undef,
2799 tooltip => "Information related to the maps", 2937 tooltip => "Information related to the maps",
2800 }, 2938 },
2939 "c/party" => {
2940 id => "party",
2941 title => "Party",
2942 reply => "gsay ",
2943 tooltip => "Messages and chat related to your party",
2944 },
2945 "c/death" => {
2946 id => "death",
2947 title => "Death",
2948 reply => undef,
2949 tooltip => "Reason for and more info about your most recent death",
2950 },
2951 "c/say" => $SAY_CHANNEL,
2952 "c/chat" => $CHAT_CHANNEL,
2801); 2953);
2802 2954
2803sub cf::client::send_msg { 2955sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2956 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2957
2806 $msg = $self->pl->expand_cfpod ($msg); 2958 $msg = $self->pl->expand_cfpod ($msg)
2959 unless $color & cf::NDI_VERBATIM;
2807 2960
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2961 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2962
2810 # check predefined channels, for the benefit of C 2963 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2964 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2965 $channel = $CHANNEL{$channel};
2813 2966
2814 $self->ext_msg (channel_info => $channel) 2967 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2818 2969
2819 } elsif (ref $channel) { 2970 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2971 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2972 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2973 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2974 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2975 }
2826 2976
2827 $channel = $channel->{id}; 2977 $channel = $channel->{id};
2828 } 2978 }
2829 2979
2830 return unless @extra || length $msg; 2980 return unless @extra || length $msg;
2831 2981
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2982 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2983 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2984 if $color & cf::NDI_DEF;
2836 2985
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2986 my $pkt = "msg "
2987 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 2989 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 2990
2851 $color &= cf::NDI_COLOR_MASK; 2991 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 2992}
2865 2993
2866=item $client->ext_msg ($type, @msg) 2994=item $client->ext_msg ($type, @msg)
2867 2995
2868Sends an ext event to the client. 2996Sends an ext event to the client.
… …
2871 2999
2872sub cf::client::ext_msg($$@) { 3000sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3001 my ($self, $type, @msg) = @_;
2874 3002
2875 if ($self->extcmd == 2) { 3003 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove 3005 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type"; 3006 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3008 }
2881} 3009}
2882 3010
2883=item $client->ext_reply ($msgid, @msg) 3011=item $client->ext_reply ($msgid, @msg)
2884 3012
… …
2888 3016
2889sub cf::client::ext_reply($$@) { 3017sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_; 3018 my ($self, $id, @msg) = @_;
2891 3019
2892 if ($self->extcmd == 2) { 3020 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) { 3022 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove 3023 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id; 3024 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 } 3026 }
2899} 3027}
2900 3028
2901=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2902 3030
… …
3029our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
3030 3158
3031$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
3032 3160
3033$safe->permit_only (Opcode::opset qw( 3161$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3162 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3163 grepstart grepwhile mapstart mapwhile
3036 sort time 3164 sort time
3037)); 3165));
3038 3166
3039# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
… …
3042 3170
3043The following functions and methods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
3044 3172
3045 cf::object 3173 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3174 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3175 insert remove name archname title slaying race decrease split
3176 value
3048 3177
3049 cf::object::player 3178 cf::object::player
3050 player 3179 player
3051 3180
3052 cf::player 3181 cf::player
… …
3057 3186
3058=cut 3187=cut
3059 3188
3060for ( 3189for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3190 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3191 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3192 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
3067) { 3196) {
3068 no strict 'refs'; 3197 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3088 3217
3089 my $qcode = $code; 3218 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
3092 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
3093 local $_; 3225 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3226
3096 my $eval = 3227 my $eval =
3097 "do {\n" 3228 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3231 . $code
3101 . "\n}" 3232 . "\n}"
3102 ; 3233 ;
3103 3234
3235 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 sub_generation_inc; 3239 sub_generation_inc;
3240 } else {
3241 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval;
3243 }
3107 3244
3108 if ($@) { 3245 if ($@) {
3109 warn "$@"; 3246 warn "$@";
3110 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
3130=cut 3267=cut
3131 3268
3132sub register_script_function { 3269sub register_script_function {
3133 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
3134 3271
3135 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
3137} 3274}
3138 3275
3139=back 3276=back
3140 3277
3141=cut 3278=cut
… …
3162 3299
3163 $facedata->{version} == 2 3300 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
3165 3302
3166 # patch in the exptable 3303 # patch in the exptable
3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3167 $facedata->{resource}{"res/exp_table"} = { 3305 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC, 3306 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3307 data => $exp_table,
3308 hash => (Digest::MD5::md5 $exp_table),
3170 }; 3309 };
3171 cf::cede_to_tick; 3310 cf::cede_to_tick;
3172 3311
3173 { 3312 {
3174 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
… …
3176 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3317
3179 cf::face::set_visibility $idx, $info->{visibility}; 3318 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3183 3322
3184 cf::cede_to_tick; 3323 cf::cede_to_tick;
3185 } 3324 }
3186 3325
3187 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
… …
3211 3350
3212 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
3213 } 3352 }
3214 3353
3215 { 3354 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3355 my $res = $facedata->{resource};
3219 3356
3220 while (my ($name, $info) = each %$res) { 3357 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3358 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3360
3225 if ($info->{type} & 1) { 3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3362 cf::face::set_type $idx, $info->{type};
3240 } else { 3363 } else {
3241 $RESOURCE{$name} = $info; 3364 $RESOURCE{$name} = $info;
3242 } 3365 }
3243 3366
… …
3276 while (my ($k, $v) = each %$want) { 3399 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3400 $ns->fx_want ($k, $v);
3278 } 3401 }
3279}; 3402};
3280 3403
3404sub load_resource_file($) {
3405 my $guard = lock_acquire "load_resource_file";
3406
3407 my $status = load_resource_file_ $_[0];
3408 get_slot 0.1, 100;
3409 cf::arch::commit_load;
3410
3411 $status
3412}
3413
3281sub reload_regions { 3414sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3415 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3416 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3417 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3418
… …
3298} 3431}
3299 3432
3300sub reload_archetypes { 3433sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3434 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3435 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3436}
3309 3437
3310sub reload_treasures { 3438sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3439 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3440 or die "unable to load treasurelists\n";
3313} 3441}
3314 3442
3315sub reload_resources { 3443sub reload_resources {
3316 warn "reloading resource files...\n"; 3444 warn "reloading resource files...\n";
3317 3445
3446 reload_facedata;
3447 reload_archetypes;
3318 reload_regions; 3448 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3449 reload_treasures;
3323 3450
3324 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
3325} 3452}
3326 3453
3327sub init {
3328 reload_resources;
3329}
3330
3331sub reload_config { 3454sub reload_config {
3455 warn "reloading config file...\n";
3456
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3458 or return;
3334 3459
3335 local $/; 3460 local $/;
3336 *CFG = YAML::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
3337 3462
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3339 3464
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3345 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3346 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
3347 }; 3472 };
3348 warn $@ if $@; 3473 warn $@ if $@;
3349 } 3474 }
3475
3476 warn "finished reloading resource files\n";
3477}
3478
3479sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!";
3482 flock $fh, &Fcntl::LOCK_EX
3483 or die "$PIDFILE: flock: $!";
3484 $fh
3485}
3486
3487# make sure only one server instance is running at any one time
3488sub atomic {
3489 my $fh = pidfile;
3490
3491 my $pid = <$fh>;
3492 kill 9, $pid if $pid > 0;
3493
3494 seek $fh, 0, 0;
3495 print $fh $$;
3496}
3497
3498sub main_loop {
3499 warn "EV::loop starting\n";
3500 if (1) {
3501 EV::loop;
3502 }
3503 warn "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP;
3350} 3505}
3351 3506
3352sub main { 3507sub main {
3508 cf::init_globals; # initialise logging
3509
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521
3353 # we must not ever block the main coroutine 3522 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3523 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3524 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3525 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3526 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3527 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3528 })->prio (Coro::PRIO_MAX);
3360 }; 3529 };
3361 3530
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3531 evthread_start IO::AIO::poll_fileno;
3368 EV::loop; 3532
3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3537 reload_resources;
3538 reload_config;
3539 db_init;
3540
3541 cf::init_uuid;
3542 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills;
3545
3546 cf::init_beforeplay;
3547
3548 atomic;
3549
3550 load_extensions;
3551
3552 utime time, time, $RUNTIMEFILE;
3553
3554 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557
3558 (pop @POST_INIT)->(0) while @POST_INIT;
3559 };
3560
3561 main_loop;
3369} 3562}
3370 3563
3371############################################################################# 3564#############################################################################
3372# initialisation and cleanup 3565# initialisation and cleanup
3373 3566
… …
3379 cf::cleanup "SIG$signal"; 3572 cf::cleanup "SIG$signal";
3380 }; 3573 };
3381 } 3574 }
3382} 3575}
3383 3576
3384sub write_runtime { 3577sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3578 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3579 # the fsync below can take a very very long time.
3389 3580
3390 IO::AIO::aio_utime $runtime, undef, undef; 3581 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3582
3392 my $guard = cf::lock_acquire "write_runtime"; 3583 my $guard = cf::lock_acquire "write_runtime";
3393 3584
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3585 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 3586 or return;
3396 3587
3397 my $value = $cf::RUNTIME + 90 + 10; 3588 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3589 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3590 # 60 allows for the watchdog to kill the server.
… …
3409 aio_utime $fh, undef, undef; 3600 aio_utime $fh, undef, undef;
3410 3601
3411 close $fh 3602 close $fh
3412 or return; 3603 or return;
3413 3604
3414 aio_rename "$runtime~", $runtime 3605 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3606 and return;
3416 3607
3417 warn "runtime file written.\n"; 3608 warn "runtime file written.\n";
3418 3609
3419 1 3610 1
3611}
3612
3613our $uuid_lock;
3614our $uuid_skip;
3615
3616sub write_uuid_sync($) {
3617 $uuid_skip ||= $_[0];
3618
3619 return if $uuid_lock;
3620 local $uuid_lock = 1;
3621
3622 my $uuid = "$LOCALDIR/uuid";
3623
3624 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3625 or return;
3626
3627 my $value = uuid_seq uuid_cur;
3628
3629 unless ($value) {
3630 warn "cowardly refusing to write zero uuid value!\n";
3631 return;
3632 }
3633
3634 my $value = uuid_str $value + $uuid_skip;
3635 $uuid_skip = 0;
3636
3637 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3638 and return;
3639
3640 # always fsync - this file is important
3641 aio_fsync $fh
3642 and return;
3643
3644 close $fh
3645 or return;
3646
3647 aio_rename "$uuid~", $uuid
3648 and return;
3649
3650 warn "uuid file written ($value).\n";
3651
3652 1
3653
3654}
3655
3656sub write_uuid($$) {
3657 my ($skip, $sync) = @_;
3658
3659 $sync ? write_uuid_sync $skip
3660 : async { write_uuid_sync $skip };
3420} 3661}
3421 3662
3422sub emergency_save() { 3663sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3664 my $freeze_guard = cf::freeze_mainloop;
3424 3665
3425 warn "enter emergency perl save\n"; 3666 warn "emergency_perl_save: enter\n";
3426 3667
3427 cf::sync_job { 3668 cf::sync_job {
3669 # this is a trade-off: we want to be very quick here, so
3670 # save all maps without fsync, and later call a global sync
3671 # (which in turn might be very very slow)
3672 local $USE_FSYNC = 0;
3673
3428 # use a peculiar iteration method to avoid tripping on perl 3674 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3675 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3676 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3677 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3678 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3679 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3680 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3681 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3682 $pl->save;
3437 } 3683 }
3438 warn "end emergency player save\n"; 3684 warn "emergency_perl_save: end player save\n";
3439 3685
3440 warn "begin emergency map save\n"; 3686 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3687 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3688 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3689 $map->valid or next;
3444 $map->save; 3690 $map->save;
3445 } 3691 }
3446 warn "end emergency map save\n"; 3692 warn "emergency_perl_save: end map save\n";
3447 3693
3448 warn "begin emergency database checkpoint\n"; 3694 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3695 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3696 warn "emergency_perl_save: end database checkpoint\n";
3697
3698 warn "emergency_perl_save: begin write uuid\n";
3699 write_uuid_sync 1;
3700 warn "emergency_perl_save: end write uuid\n";
3451 }; 3701 };
3452 3702
3703 warn "emergency_perl_save: starting sync()\n";
3704 IO::AIO::aio_sync sub {
3705 warn "emergency_perl_save: finished sync()\n";
3706 };
3707
3453 warn "leave emergency perl save\n"; 3708 warn "emergency_perl_save: leave\n";
3454} 3709}
3455 3710
3456sub post_cleanup { 3711sub post_cleanup {
3457 my ($make_core) = @_; 3712 my ($make_core) = @_;
3458 3713
3459 warn Carp::longmess "post_cleanup backtrace" 3714 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3715 if $make_core;
3716
3717 my $fh = pidfile;
3718 unlink $PIDFILE if <$fh> == $$;
3719}
3720
3721# a safer delete_package, copied from Symbol
3722sub clear_package($) {
3723 my $pkg = shift;
3724
3725 # expand to full symbol table name if needed
3726 unless ($pkg =~ /^main::.*::$/) {
3727 $pkg = "main$pkg" if $pkg =~ /^::/;
3728 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3729 $pkg .= '::' unless $pkg =~ /::$/;
3730 }
3731
3732 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3733 my $stem_symtab = *{$stem}{HASH};
3734
3735 defined $stem_symtab and exists $stem_symtab->{$leaf}
3736 or return;
3737
3738 # clear all symbols
3739 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3740 for my $name (keys %$leaf_symtab) {
3741 _gv_clear *{"$pkg$name"};
3742# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3743 }
3744 warn "cleared package $pkg\n";#d#
3461} 3745}
3462 3746
3463sub do_reload_perl() { 3747sub do_reload_perl() {
3464 # can/must only be called in main 3748 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3749 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3750 warn "can only reload from main coroutine";
3467 return; 3751 return;
3468 } 3752 }
3469 3753
3754 return if $RELOAD++;
3755
3756 my $t1 = EV::time;
3757
3758 while ($RELOAD) {
3470 warn "reloading..."; 3759 warn "reloading...";
3471 3760
3472 warn "entering sync_job"; 3761 warn "entering sync_job";
3473 3762
3474 cf::sync_job { 3763 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3764 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3765 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3766 cf::write_runtime_sync; # external watchdog should not bark
3478 3767
3479 warn "syncing database to disk"; 3768 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3770
3482 # if anything goes wrong in here, we should simply crash as we already saved 3771 # if anything goes wrong in here, we should simply crash as we already saved
3483 3772
3484 warn "flushing outstanding aio requests"; 3773 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3774 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3775 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3776 }
3516 3777
3517 warn "... nuking $pkg"; 3778 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3779 $_->cancel for values %EXT_CORO;
3519 } 3780 %EXT_CORO = ();
3520 3781
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3782 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3783 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3784
3785 warn "removing ext/exti commands";
3786 %EXTCMD = ();
3787 %EXTICMD = ();
3788
3789 warn "unloading/nuking all extensions";
3790 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3791 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3792
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3793 if (my $cb = $pkg->can ("unload")) {
3794 eval {
3532 $cb->(); 3795 $cb->($pkg);
3796 1
3797 } or warn "$pkg unloaded, but with errors: $@";
3798 }
3799
3800 warn "... clearing $pkg";
3801 clear_package $pkg;
3533 } 3802 }
3534 3803
3535 Symbol::delete_package $k; 3804 warn "unloading all perl modules loaded from $LIBDIR";
3805 while (my ($k, $v) = each %INC) {
3806 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3807
3808 warn "... unloading $k";
3809 delete $INC{$k};
3810
3811 $k =~ s/\.pm$//;
3812 $k =~ s/\//::/g;
3813
3814 if (my $cb = $k->can ("unload_module")) {
3815 $cb->();
3816 }
3817
3818 clear_package $k;
3536 } 3819 }
3537 3820
3538 warn "getting rid of safe::, as good as possible"; 3821 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3822 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3823 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3824
3542 warn "unloading cf.pm \"a bit\""; 3825 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3826 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3827 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3828
3546 # don't, removes xs symbols, too, 3829 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3830 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3831 #clear_package __PACKAGE__;
3549 3832
3550 warn "unload completed, starting to reload now"; 3833 warn "unload completed, starting to reload now";
3551 3834
3552 warn "reloading cf.pm"; 3835 warn "reloading cf.pm";
3553 require cf; 3836 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3837 cf::_connect_to_perl_1;
3555 3838
3556 warn "loading config and database again"; 3839 warn "loading config and database again";
3557 cf::reload_config; 3840 cf::reload_config;
3558 3841
3559 warn "loading extensions"; 3842 warn "loading extensions";
3560 cf::load_extensions; 3843 cf::load_extensions;
3561 3844
3845 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3846 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3847 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3848 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3849 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3850 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3851 reattach $_ for values %PLAYER;
3852 }
3568 3853
3854 warn "running post_init jobs";
3855 (pop @POST_INIT)->(1) while @POST_INIT;
3856
3569 warn "leaving sync_job"; 3857 warn "leaving sync_job";
3570 3858
3571 1 3859 1
3572 } or do { 3860 } or do {
3573 warn $@; 3861 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3862 cf::cleanup "error while reloading, exiting.";
3575 }; 3863 };
3576 3864
3577 warn "reloaded"; 3865 warn "reloaded";
3866 --$RELOAD;
3867 }
3868
3869 $t1 = EV::time - $t1;
3870 warn "reload completed in ${t1}s\n";
3578}; 3871};
3579 3872
3580our $RELOAD_WATCHER; # used only during reload 3873our $RELOAD_WATCHER; # used only during reload
3581 3874
3582sub reload_perl() { 3875sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3876 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3877 # coro crashes during coro_state_free->destroy here.
3585 3878
3879 $RELOAD_WATCHER ||= cf::async {
3880 Coro::AIO::aio_wait cache_extensions;
3881
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3882 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3883 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3884 undef $RELOAD_WATCHER;
3885 };
3589 }; 3886 };
3590} 3887}
3591 3888
3592register_command "reload" => sub { 3889register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3890 my ($who, $arg) = @_;
… …
3607 3904
3608our @WAIT_FOR_TICK; 3905our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3906our @WAIT_FOR_TICK_BEGIN;
3610 3907
3611sub wait_for_tick { 3908sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3909 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3614 3910
3615 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3912 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3913 $signal->wait;
3618} 3914}
3619 3915
3620sub wait_for_tick_begin { 3916sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3917 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3623 3918
3624 my $signal = new Coro::Signal; 3919 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3920 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3921 $signal->wait;
3627} 3922}
… …
3633 return; 3928 return;
3634 } 3929 }
3635 3930
3636 cf::server_tick; # one server iteration 3931 cf::server_tick; # one server iteration
3637 3932
3933 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3934
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3935 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3936 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3937 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3938 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3939 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3940 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3941 };
3645 } 3942 }
3646 3943
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3944 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3664} 3961}
3665 3962
3666{ 3963{
3667 # configure BDB 3964 # configure BDB
3668 3965
3669 BDB::min_parallel 8; 3966 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 3967 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3968 $AnyEvent::BDB::WATCHER->priority (1);
3672 3969
3673 unless ($DB_ENV) { 3970 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3971 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3972 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3973 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3974 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3975 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3976 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3977
3680 cf::sync_job { 3978 cf::sync_job {
3681 eval { 3979 eval {
… …
3707{ 4005{
3708 # configure IO::AIO 4006 # configure IO::AIO
3709 4007
3710 IO::AIO::min_parallel 8; 4008 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4009 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4010 undef $AnyEvent::AIO::WATCHER;
3713} 4011}
3714 4012
3715my $_log_backtrace; 4013my $_log_backtrace;
3716 4014
3717sub _log_backtrace { 4015sub _log_backtrace {
… …
3720 $msg =~ s/\n//; 4018 $msg =~ s/\n//;
3721 4019
3722 # limit the # of concurrent backtraces 4020 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4021 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 4022 ++$_log_backtrace;
4023 my $perl_bt = Carp::longmess $msg;
3725 async { 4024 async {
3726 $Coro::current->{desc} = "abt $msg"; 4025 $Coro::current->{desc} = "abt $msg";
3727 4026
3728 my @bt = fork_call { 4027 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4028 @addr = map { sprintf "%x", $_ } @addr;
… …
3740 } 4039 }
3741 4040
3742 @funcs 4041 @funcs
3743 }; 4042 };
3744 4043
3745 LOG llevInfo, "[ABT] $msg\n"; 4044 LOG llevInfo, "[ABT] $perl_bt\n";
4045 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4046 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4047 --$_log_backtrace;
3748 }; 4048 };
3749 } else { 4049 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4050 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4051 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 4052 }
3753} 4053}
3754 4054
3755# load additional modules 4055# load additional modules
3756use cf::pod; 4056require "cf/$_.pm" for @EXTRA_MODULES;
4057cf::_connect_to_perl_2;
3757 4058
3758END { cf::emergency_save } 4059END { cf::emergency_save }
3759 4060
37601 40611
3761 4062

Diff Legend

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