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.325 by root, Sat Jul 28 14:32:22 2007 UTC vs.
Revision 1.489 by root, Fri Oct 23 03:08:35 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
14 37
38use Guard ();
15use Coro 3.61 (); 39use Coro ();
16use Coro::State; 40use Coro::State;
17use Coro::Handle; 41use Coro::Handle;
42use Coro::EV;
18use Coro::Event; 43use Coro::AnyEvent;
19use Coro::Timer; 44use Coro::Timer;
20use Coro::Signal; 45use Coro::Signal;
21use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
22use Coro::AIO; 49use Coro::AIO;
50use Coro::BDB 1.6;
23use Coro::Storable; 51use Coro::Storable;
52use Coro::Util ();
24 53
25use JSON::XS 1.4 (); 54use JSON::XS 2.01 ();
26use BDB (); 55use BDB ();
27use Data::Dumper; 56use Data::Dumper;
28use Digest::MD5; 57use Digest::MD5;
29use Fcntl; 58use Fcntl;
30use YAML::Syck (); 59use YAML::XS ();
31use IO::AIO 2.32 (); 60use IO::AIO ();
32use Time::HiRes; 61use Time::HiRes;
33use Compress::LZF; 62use Compress::LZF;
34use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
35 66
36# configure various modules to our taste 67# configure various modules to our taste
37# 68#
38$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41 77
42$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
43 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
74 112
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 115our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
82 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
85 124
86our %CFG; 125our %CFG;
87 126
88our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 128our $RUNTIME;
129our $NOW;
90 130
91our %PLAYER; # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 132our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
94 134
95# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 137
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
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 :)
101 147
102binmode STDOUT; 148binmode STDOUT;
103binmode STDERR; 149binmode STDERR;
104 150
105# read virtual server time, if available 151# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
110} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
111 159
112mkdir $_ 160mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 162
115our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
116 164
117sub 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::"} };
118 177
119############################################################################# 178#############################################################################
120 179
121=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
122 181
… …
158 217
159The raw value load value from the last tick. 218The raw value load value from the last tick.
160 219
161=item %cf::CFG 220=item %cf::CFG
162 221
163Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 223from wherever your confdir points to.
165 224
166=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
167 226
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns 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
170per 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.
171 230
172=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
173 232
174This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
175C<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
176that call. 235that call.
177 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
178=back 243=back
179 244
180=cut 245=cut
181 246
182BEGIN { 247$Coro::State::WARNHOOK = sub {
183 *CORE::GLOBAL::warn = sub {
184 my $msg = join "", @_; 248 my $msg = join "", @_;
185 249
186 $msg .= "\n" 250 $msg .= "\n"
187 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
188 252
189 $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;
190 254
191 utf8::encode $msg;
192 LOG llevError, $msg; 255 LOG llevError, $msg;
193 }; 256};
194} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
195 271
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
206for my $pkg (qw( 282for my $pkg (qw(
207 cf::global cf::attachable 283 cf::global cf::attachable
208 cf::object cf::object::player 284 cf::object cf::object::player
209 cf::client cf::player 285 cf::client cf::player
210 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
211 cf::map cf::party cf::region 288 cf::party cf::region
212)) { 289)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 291}
216 292
217$Event::DIED = sub { 293$EV::DIED = sub {
218 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
219}; 295};
220 296
221############################################################################# 297#############################################################################
222 298
… …
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 322 $d
247 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
248} 324}
249 325
250=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
251 327
252Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
253 329
254=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
255 331
256Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
257 333
258=cut 334=cut
259 335
260our $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
261 337
262sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
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}
264 354
265=item cf::lock_wait $string 355=item cf::lock_wait $string
266 356
267Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
268 358
269=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
270 360
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
274returned. 364returned.
275 365
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
276Lock names should begin with a unique identifier (for example, cf::map::find 369Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
278 371
279=item $locked = cf::lock_active $string 372=item $locked = cf::lock_active $string
280 373
281Return 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.
282 375
283=cut 376=cut
284 377
285our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
286 379
287sub lock_wait($) { 380sub lock_wait($) {
288 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 382}
296 383
297sub lock_acquire($) { 384sub lock_acquire($) {
298 my ($key) = @_; 385 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 386}
310 387
311sub lock_active($) { 388sub lock_active($) {
312 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 390}
316 391
317sub freeze_mainloop { 392sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
319 394
320 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start; 396}
322 }; 397
323 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
324 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
325} 411}
326 412
327=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
328 414
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
340our @SLOT_QUEUE; 426our @SLOT_QUEUE;
341our $SLOT_QUEUE; 427our $SLOT_QUEUE;
342 428
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
345 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
346 434
347 while () { 435 while () {
348 next_job: 436 next_job:
349 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
… …
357 } 445 }
358 } 446 }
359 } 447 }
360 448
361 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 452 $signal->wait;
365 } else { 453 } else {
366 Coro::schedule; 454 Coro::schedule;
367 } 455 }
368 } 456 }
369}; 457};
370 458
371sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
372 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
373 463
374 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
376 466
… …
390 480
391BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
392 482
393=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
394 484
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 488acceptable.
399 489
400If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
… …
406 496
407sub sync_job(&) { 497sub sync_job(&) {
408 my ($job) = @_; 498 my ($job) = @_;
409 499
410 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 501 my $time = EV::time;
412 502
413 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
415 505
416 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 507
418 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
419 509
420 my $busy = 1; 510 my $busy = 1;
421 my @res; 511 my @res;
422 512
423 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 515 @res = eval { $job->() };
425 warn $@ if $@; 516 warn $@ if $@;
426 undef $busy; 517 undef $busy;
427 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
428 519
429 while ($busy) { 520 while ($busy) {
430 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
431 } 525 }
526 }
432 527
433 $time = Event::time - $time; 528 my $time = EV::time - $time;
434 529
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
439 531
440 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
441 } else { 533 } else {
442 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
443 535
… …
468=item fork_call { }, $args 560=item fork_call { }, $args
469 561
470Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
474 566
475=cut 567=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 568
486sub fork_call(&@) { 569sub fork_call(&@) {
487 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
488 571
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 572 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 573 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 574 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 575
494 if (my $pid = fork) { 576 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 577 reset_signals;
508 local $SIG{__WARN__}; 578 &$cb
509 local $SIG{__DIE__}; 579 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 580
516 eval { 581 wantarray ? @res : $res[-1]
517 close $fh1; 582}
518 583
519 my @res = eval { $cb->(@args) }; 584=item $coin = coin_from_name $name
520 585
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 586=cut
522 close $fh2;
523 };
524 587
525 warn $@ if $@; 588our %coin_alias = (
526 _exit 0; 589 "silver" => "silvercoin",
527 } 590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
528} 609}
529 610
530=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
531 612
532Returns a single value from the environment database. 613Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
535 616
536Stores the given C<$value> in the family. It can currently store binary 617Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 618data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 619
620=item $db = cf::db_table "name"
621
622Create and/or open a new database table. The string must not be "db" and must be unique
623within each server.
624
539=cut 625=cut
626
627sub db_table($) {
628 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV;
630
631 eval {
632 $db->set_flags (BDB::CHKSUM);
633
634 utf8::encode $name;
635 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
636 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
637 cf::cleanup "db_open(db): $!" if $!;
638 };
639 cf::cleanup "db_open(db): $@" if $@;
640
641 $db
642}
540 643
541our $DB; 644our $DB;
542 645
543sub db_init { 646sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 647 cf::sync_job {
548 eval { 648 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 649 };
558} 650}
559 651
560sub db_get($$) { 652sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
562 654
… …
612 if (1) { 704 if (1) {
613 $md5 = 705 $md5 =
614 join "\x00", 706 join "\x00",
615 $processversion, 707 $processversion,
616 map { 708 map {
617 Coro::cede; 709 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 710 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 711 } 0.. $#$src;
620 712
621 713
622 my $dbmd5 = db_get cache => "$id/md5"; 714 my $dbmd5 = db_get cache => "$id/md5";
… …
660 752
661############################################################################# 753#############################################################################
662 754
663=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
664 756
665Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
666attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
668 760
669In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 763Deliantra).
672 764
673=over 4 765=over 4
674 766
675=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
676 768
… …
720=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
721 813
722Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
724 816
725Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
726that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
727 819
728These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
729 821
730=over 4 822=over 4
… …
958 } 1050 }
959 1051
960 0 1052 0
961} 1053}
962 1054
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1056
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1058
967Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
968 1060
… …
974 1066
975=cut 1067=cut
976 1068
977############################################################################# 1069#############################################################################
978# object support 1070# object support
979#
980 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
981sub _can_merge { 1105sub _can_merge {
982 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
983 1107
984 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1109
988 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
989} 1112}
990 1113
991sub reattach { 1114sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1116 my ($obj) = @_;
994 1117
1118 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1120
997 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
998 1122
999 @$registry = (); 1123 @$registry = ();
1000 1124
… …
1015cf::attachable->attach ( 1139cf::attachable->attach (
1016 prio => -1000000, 1140 prio => -1000000,
1017 on_instantiate => sub { 1141 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1019 1143
1020 $data = from_json $data; 1144 $data = decode_json $data;
1021 1145
1022 for (@$data) { 1146 for (@$data) {
1023 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1024 1148
1025 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
… …
1041sub object_freezer_save { 1165sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1043 1167
1044 sync_job { 1168 sync_job {
1045 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1048 1173
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1053 close $fh; 1181 aio_close $fh;
1054 1182
1055 if (@$objs) { 1183 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1061 close $fh; 1192 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1194 }
1064 } else { 1195 } else {
1065 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1066 } 1197 }
1067 1198
1068 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1069 } else { 1203 } else {
1070 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1071 } 1205 }
1072 } else { 1206 } else {
1073 aio_unlink $filename; 1207 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1075 } 1209 }
1076 } 1210 };
1077} 1211}
1078 1212
1079sub object_freezer_as_string { 1213sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
1081 1215
… …
1093 or return; 1227 or return;
1094 1228
1095 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1231 or return;
1232
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1099 } 1235 }
1100 1236
1237 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
1240
1103 return ($data, $av); 1241 ($data, $av)
1104} 1242}
1105 1243
1106=head2 COMMAND CALLBACKS 1244=head2 COMMAND CALLBACKS
1107 1245
1108=over 4 1246=over 4
… …
1162 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1163 1301
1164 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1165} 1303}
1166 1304
1305use File::Glob ();
1306
1167cf::player->attach ( 1307cf::player->attach (
1168 on_command => sub { 1308 on_command => sub {
1169 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1170 1310
1171 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1186 my ($type, $reply, @payload) = 1326 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1327 "ARRAY" eq ref $msg
1188 ? @$msg 1328 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1329 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1330
1331 my @reply;
1332
1191 if (my $cb = $EXTCMD{$type}) { 1333 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1334 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1335 }
1336
1337 $pl->ext_reply ($reply, @reply)
1338 if $reply;
1339
1197 } else { 1340 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1342 }
1200 1343
1201 cf::override; 1344 cf::override;
1202 }, 1345 },
1203); 1346);
1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1204 1360
1205sub load_extensions { 1361sub load_extensions {
1206 cf::sync_job { 1362 cf::sync_job {
1207 my %todo; 1363 my %todo;
1208 1364
… …
1228 1384
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1387
1232 $ext{source} = 1388 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1235 . $source 1391 . $source
1236 . "\n};\n1"; 1392 . "\n};\n1";
1237 1393
1238 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1256 1412
1257 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1414 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1416 }
1262 1417
1263 warn $msg; 1418 warn $msg;
1264 } 1419 }
1265 1420
… …
1279 1434
1280=back 1435=back
1281 1436
1282=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1283 1438
1284Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1285 1440
1286=cut 1441=cut
1287 1442
1288package cf::player; 1443package cf::player;
1289 1444
1290use Coro::AIO; 1445use Coro::AIO;
1291 1446
1292=head3 cf::player 1447=head3 cf::player
1293 1448
1294=over 4 1449=over 4
1450
1451=item cf::player::num_playing
1452
1453Returns the official number of playing players, as per the Crossfire metaserver rules.
1454
1455=cut
1456
1457sub num_playing {
1458 scalar grep
1459 $_->ob->map
1460 && !$_->hidden
1461 && !$_->ob->flag (cf::FLAG_WIZ),
1462 cf::player::list
1463}
1295 1464
1296=item cf::player::find $login 1465=item cf::player::find $login
1297 1466
1298Returns the given player object, loading it if necessary (might block). 1467Returns the given player object, loading it if necessary (might block).
1299 1468
… …
1318 1487
1319sub exists($) { 1488sub exists($) {
1320 my ($login) = @_; 1489 my ($login) = @_;
1321 1490
1322 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1324} 1493}
1325 1494
1326sub find($) { 1495sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1497 my $login = $_[0];
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1504 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1505 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1506 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1508
1340 my $pl = load_pl path $login 1509 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1510 or return;
1511
1512 my $pl = cf::player::load_pl $f
1513 or return;
1514
1515 local $cf::PLAYER_LOADING{$login} = $pl;
1516 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1343 } 1518 }
1344 } 1519 }
1345} 1520}
1346 1521
… …
1355 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1356 1531
1357 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1359 1534
1535 cf::get_slot 0.01;
1536
1360 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1361 Coro::cede; 1538 cf::cede_to_tick;
1362} 1539}
1363 1540
1364sub new($) { 1541sub new($) {
1365 my ($login) = @_; 1542 my ($login) = @_;
1366 1543
… …
1372 $cf::PLAYER{$login} = $self; 1549 $cf::PLAYER{$login} = $self;
1373 1550
1374 $self 1551 $self
1375} 1552}
1376 1553
1554=item $player->send_msg ($channel, $msg, $color, [extra...])
1555
1556=cut
1557
1558sub send_msg {
1559 my $ns = shift->ns
1560 or return;
1561 $ns->send_msg (@_);
1562}
1563
1377=item $pl->quit_character 1564=item $pl->quit_character
1378 1565
1379Nukes the player without looking back. If logged in, the connection will 1566Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1567be destroyed. May block for a long time.
1381 1568
… …
1385 my ($pl) = @_; 1572 my ($pl) = @_;
1386 1573
1387 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1388 1575
1389 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1390 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1391 1578
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1396 1585
1397 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1434 or return []; 1623 or return [];
1435 1624
1436 my @logins; 1625 my @logins;
1437 1626
1438 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1628 my $path = path $login;
1629
1630 # a .pst is a dead give-away for a valid player
1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1636 }
1442 1637
1443 utf8::decode $login; 1638 utf8::decode $login;
1444 push @logins, $login; 1639 push @logins, $login;
1445 } 1640 }
1446 1641
… …
1473 } 1668 }
1474 1669
1475 \@paths 1670 \@paths
1476} 1671}
1477 1672
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1479 1674
1480Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1676
1528=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1529 1678
1530Sends an ext reply to the player. 1679Sends an ext reply to the player.
1531 1680
1532=cut 1681=cut
1533 1682
1534sub ext_reply($$@) { 1683sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1684 my ($self, $id, @msg) = @_;
1536 1685
1537 if ($self->ns->extcmd == 2) { 1686 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1687}
1545 1688
1546=item $player->ext_msg ($type, @msg) 1689=item $player->ext_msg ($type, @msg)
1547 1690
1548Sends an ext event to the client. 1691Sends an ext event to the client.
… …
1604our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1606 1749
1607sub generate_random_map { 1750sub generate_random_map {
1608 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1609 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1756 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1735 1881
1736# the temporary/swap location 1882# the temporary/swap location
1737sub save_path { 1883sub save_path {
1738 my ($self) = @_; 1884 my ($self) = @_;
1739 1885
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1742} 1888}
1743 1889
1744# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1745sub uniq_path { 1891sub uniq_path {
1746 my ($self) = @_; 1892 my ($self) = @_;
1747 1893
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1750}
1751
1752# and all this just because we cannot iterate over
1753# all maps in C++...
1754sub change_all_map_light {
1755 my ($change) = @_;
1756
1757 $_->change_map_light ($change)
1758 for grep $_->outdoor, values %cf::MAP;
1759} 1896}
1760 1897
1761sub decay_objects { 1898sub decay_objects {
1762 my ($self) = @_; 1899 my ($self) = @_;
1763 1900
… …
1776 1913
1777sub load_header_from($) { 1914sub load_header_from($) {
1778 my ($self, $path) = @_; 1915 my ($self, $path) = @_;
1779 1916
1780 utf8::encode $path; 1917 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1918 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1919 or return;
1920
1921 $self->_load_header ($f)
1922 or return;
1923
1924 local $MAP_LOADING{$self->{path}} = $self;
1925 $f->resolve_delayed_derefs;
1786 1926
1787 $self->{load_path} = $path; 1927 $self->{load_path} = $path;
1788 1928
1789 1 1929 1
1790} 1930}
… …
1844sub find { 1984sub find {
1845 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1846 1986
1847 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1848 1988
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1850 1991
1851 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path";
1853 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1854 or return; 1994 or return;
1855 1995
1856 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1857 1997
… …
1859 or return; 1999 or return;
1860 2000
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2005 undef $guard1;
1864 $map->reset; 2006 $map->reset;
1865 undef $guard;
1866 return find $path; 2007 return find $path;
1867 } 2008 }
1868 2009
1869 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1870 } 2011 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
1880 2021
1881 my $path = $self->{path}; 2022 my $path = $self->{path};
1882 2023
1883 { 2024 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2025 my $guard = cf::lock_acquire "map_data:$path";
1885 2026
2027 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2028 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2029
1888 $self->in_memory (cf::MAP_LOADING); 2030 $self->in_memory (cf::MAP_LOADING);
1889 2031
1890 $self->alloc; 2032 $self->alloc;
1891 2033
1892 $self->pre_load; 2034 $self->pre_load;
1893 Coro::cede; 2035 cf::cede_to_tick;
1894 2036
2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2039 $self->_load_objects ($f)
1896 or return; 2040 or return;
1897 2041
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1899 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1900 2044
1901 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2046 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2047 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2049 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2050 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs;
2052 }
1906 } 2053 }
1907 } 2054 }
1908 2055
1909 Coro::cede; 2056 $f->resolve_delayed_derefs;
2057
2058 cf::cede_to_tick;
1910 # now do the right thing for maps 2059 # now do the right thing for maps
1911 $self->link_multipart_objects; 2060 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2061 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2062 unless $self->difficulty;
1914 Coro::cede; 2063 cf::cede_to_tick;
1915 2064
1916 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2066 $self->decay_objects;
1918 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1919 $self->update_buttons; 2068 $self->update_buttons;
1920 Coro::cede; 2069 cf::cede_to_tick;
1921 $self->set_darkness_map;
1922 Coro::cede;
1923 $self->activate; 2070 $self->activate;
1924 } 2071 }
1925 2072
1926 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
1928 2075
1929 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1930 } 2077 }
1931 2078
1932 $self->post_load; 2079 $self->post_load;
1933} 2080}
1934 2081
… …
1943 2090
1944 $self 2091 $self
1945} 2092}
1946 2093
1947# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1948sub load_diag { 2095sub load_neighbours {
1949 my ($map) = @_; 2096 my ($map) = @_;
1950 2097
1951 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1952 2099
1953 for (0 .. 3) { 2100 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1955 or next; 2102 or next;
1956 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1957 or next; 2104 or next;
1958 $neigh->load; 2105 $neigh->load;
1959 2106
2107 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2110 }
1963 2111
1964 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1966 or next; 2115 or next;
1967 $neigh->load; 2116 $neigh->load;
1968 } 2117 }
1969} 2118}
1970 2119
… …
1975} 2124}
1976 2125
1977sub do_load_sync { 2126sub do_load_sync {
1978 my ($map) = @_; 2127 my ($map) = @_;
1979 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1980 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1981} 2133}
1982 2134
1983our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1985 2137
1986sub find_async { 2138sub find_async {
1987 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1988 2140
1989 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1990 2142
1991 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1993 } 2145 }
1994 2146
1995 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1996 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1997 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2154 if (my $map = find $k) {
2000 $map->load; 2155 $map->load if $v;
2001 } 2156 }
2002 2157
2003 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
2004 } 2159 }
2005 } 2160 }
2006 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
2007 }; 2162 };
2008 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
… …
2011} 2166}
2012 2167
2013sub save { 2168sub save {
2014 my ($self) = @_; 2169 my ($self) = @_;
2015 2170
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2172
2018 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2019 2174
2020 return unless $self->dirty; 2175 return unless $self->dirty;
2021 2176
… …
2027 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2028 2183
2029 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2030 2185
2031 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2032 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2033 }; 2189 };
2190
2191 cf::get_slot 0.02;
2034 2192
2035 if ($uniq) { 2193 if ($uniq) {
2036 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2037 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2038 } else { 2196 } else {
… …
2044 my ($self) = @_; 2202 my ($self) = @_;
2045 2203
2046 # save first because save cedes 2204 # save first because save cedes
2047 $self->save; 2205 $self->save;
2048 2206
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2208
2051 return if $self->players; 2209 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2053 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2054 2212
2213 $self->in_memory (cf::MAP_SWAPPED);
2214
2215 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP;
2055 $self->clear; 2217 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2218}
2058 2219
2059sub reset_at { 2220sub reset_at {
2060 my ($self) = @_; 2221 my ($self) = @_;
2061 2222
… …
2079 2240
2080 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2081 2242
2082 return if $self->players; 2243 return if $self->players;
2083 2244
2084 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2085 2246
2086 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2087 2248
2088 # need to save uniques path 2249 # need to save uniques path
2089 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2093 if $uniq; 2254 if $uniq;
2094 } 2255 }
2095 2256
2096 delete $cf::MAP{$self->path}; 2257 delete $cf::MAP{$self->path};
2097 2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2261 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2262
2102 $self->unlink_save; 2263 $self->unlink_save;
2103 $self->destroy; 2264 $self->destroy;
2104} 2265}
2105 2266
2106my $nuke_counter = "aaaa"; 2267my $nuke_counter = "aaaa";
2107 2268
2108sub nuke { 2269sub nuke {
2109 my ($self) = @_; 2270 my ($self) = @_;
2110 2271
2272 {
2273 my $lock = cf::lock_acquire "map_data:$self->{path}";
2274
2111 delete $cf::MAP{$self->path}; 2275 delete $cf::MAP{$self->path};
2112 2276
2113 $self->unlink_save; 2277 $self->unlink_save;
2114 2278
2115 bless $self, "cf::map"; 2279 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2280 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2281 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2282 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2284
2121 $cf::MAP{$self->path} = $self; 2285 $cf::MAP{$self->path} = $self;
2286 }
2122 2287
2123 $self->reset; # polite request, might not happen 2288 $self->reset; # polite request, might not happen
2124} 2289}
2125 2290
2126=item $maps = cf::map::tmp_maps 2291=item $maps = cf::map::tmp_maps
… …
2168 2333
2169sub unique_maps() { 2334sub unique_maps() {
2170 [ 2335 [
2171 map { 2336 map {
2172 utf8::decode $_; 2337 utf8::decode $_;
2173 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2174 ? normalise $_ 2341 : normalise $_
2175 : ()
2176 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2177 ] 2343 ]
2178} 2344}
2179 2345
2180package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory). May block.
2350
2351=cut
2352
2353sub static_maps() {
2354 my @dirs = "";
2355 my @maps;
2356
2357 while (@dirs) {
2358 my $dir = shift @dirs;
2359
2360 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2361 or return;
2362
2363 for (@$files) {
2364 s/\.map$// or next;
2365 utf8::decode $_;
2366 push @maps, "$dir/$_";
2367 }
2368
2369 push @dirs, map "$dir/$_", @$dirs;
2370 }
2371
2372 \@maps
2373}
2181 2374
2182=back 2375=back
2183 2376
2184=head3 cf::object 2377=head3 cf::object
2185 2378
… …
2189 2382
2190=over 4 2383=over 4
2191 2384
2192=item $ob->inv_recursive 2385=item $ob->inv_recursive
2193 2386
2194Returns the inventory of the object _and_ their inventories, recursively. 2387Returns the inventory of the object I<and> their inventories, recursively,
2388but I<not> the object itself.
2195 2389
2196=cut 2390=cut
2197 2391
2198sub inv_recursive_; 2392sub inv_recursive_;
2199sub inv_recursive_ { 2393sub inv_recursive_ {
… …
2202 2396
2203sub inv_recursive { 2397sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2398 inv_recursive_ inv $_[0]
2205} 2399}
2206 2400
2401=item $ref = $ob->ref
2402
2403Creates and returns a persistent reference to an object that can be stored as a string.
2404
2405=item $ob = cf::object::deref ($refstring)
2406
2407returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2408even if the object actually exists. May block.
2409
2410=cut
2411
2412sub deref {
2413 my ($ref) = @_;
2414
2415 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2416 my ($uuid, $name) = ($1, $2);
2417 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2418 or return;
2419 $pl->ob->uuid eq $uuid
2420 or return;
2421
2422 $pl->ob
2423 } else {
2424 warn "$ref: cannot resolve object reference\n";
2425 undef
2426 }
2427}
2428
2207package cf; 2429package cf;
2208 2430
2209=back 2431=back
2210 2432
2211=head3 cf::object::player 2433=head3 cf::object::player
… …
2217Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2439Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2218can be C<undef>. Does the right thing when the player is currently in a 2440can be C<undef>. Does the right thing when the player is currently in a
2219dialogue with the given NPC character. 2441dialogue with the given NPC character.
2220 2442
2221=cut 2443=cut
2444
2445our $SAY_CHANNEL = {
2446 id => "say",
2447 title => "Map",
2448 reply => "say ",
2449 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2450};
2451
2452our $CHAT_CHANNEL = {
2453 id => "chat",
2454 title => "Chat",
2455 reply => "chat ",
2456 tooltip => "Player chat and shouts, global to the server.",
2457};
2222 2458
2223# rough implementation of a future "reply" method that works 2459# rough implementation of a future "reply" method that works
2224# with dialog boxes. 2460# with dialog boxes.
2225#TODO: the first argument must go, split into a $npc->reply_to ( method 2461#TODO: the first argument must go, split into a $npc->reply_to ( method
2226sub cf::object::player::reply($$$;$) { 2462sub cf::object::player::reply($$$;$) {
… …
2238 my $dialog = $pl->{npc_dialog}; 2474 my $dialog = $pl->{npc_dialog};
2239 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2475 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2240 2476
2241 } else { 2477 } else {
2242 $msg = $npc->name . " says: $msg" if $npc; 2478 $msg = $npc->name . " says: $msg" if $npc;
2243 $self->message ($msg, $flags); 2479 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2244 } 2480 }
2245 } 2481 }
2482}
2483
2484=item $object->send_msg ($channel, $msg, $color, [extra...])
2485
2486=cut
2487
2488sub cf::object::send_msg {
2489 my $pl = shift->contr
2490 or return;
2491 $pl->send_msg (@_);
2246} 2492}
2247 2493
2248=item $player_object->may ("access") 2494=item $player_object->may ("access")
2249 2495
2250Returns wether the given player is authorized to access resource "access" 2496Returns wether the given player is authorized to access resource "access"
… …
2263 2509
2264=item $player_object->enter_link 2510=item $player_object->enter_link
2265 2511
2266Freezes the player and moves him/her to a special map (C<{link}>). 2512Freezes the player and moves him/her to a special map (C<{link}>).
2267 2513
2268The player should be reasonably safe there for short amounts of time. You 2514The player should be reasonably safe there for short amounts of time (e.g.
2269I<MUST> call C<leave_link> as soon as possible, though. 2515for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2516though, as the palyer cannot control the character while it is on the link
2517map.
2270 2518
2271Will never block. 2519Will never block.
2272 2520
2273=item $player_object->leave_link ($map, $x, $y) 2521=item $player_object->leave_link ($map, $x, $y)
2274 2522
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2577 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2578 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2579 if $x <=0 && $y <= 0;
2332 2580
2333 $map->load; 2581 $map->load;
2334 $map->load_diag; 2582 $map->load_neighbours;
2335 2583
2336 return unless $self->contr->active; 2584 return unless $self->contr->active;
2337 $self->activate_recursive;
2338 2585
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2586 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2340 $self->enter_map ($map, $x, $y); 2587 $self->enter_map ($map, $x, $y);
2588
2589 # only activate afterwards, to support waiting in hooks
2590 $self->activate_recursive;
2341} 2591}
2342 2592
2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2593=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2344 2594
2345Moves the player to the given map-path and coordinates by first freezing 2595Moves the player to the given map-path and coordinates by first freezing
2346her, loading and preparing them map, calling the provided $check callback 2596her, loading and preparing them map, calling the provided $check callback
2347that has to return the map if sucecssful, and then unfreezes the player on 2597that has to return the map if sucecssful, and then unfreezes the player on
2348the new (success) or old (failed) map position. In either case, $done will 2598the new (success) or old (failed) map position. In either case, $done will
2349be called at the end of this process. 2599be called at the end of this process.
2350 2600
2601Note that $check will be called with a potentially non-loaded map, so if
2602it needs a loaded map it has to call C<< ->load >>.
2603
2351=cut 2604=cut
2352 2605
2353our $GOTOGEN; 2606our $GOTOGEN;
2354 2607
2355sub cf::object::player::goto { 2608sub cf::object::player::goto {
… …
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2612 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2613
2361 $self->enter_link; 2614 $self->enter_link;
2362 2615
2363 (async { 2616 (async {
2617 $Coro::current->{desc} = "player::goto $path $x $y";
2618
2619 # *tag paths override both path and x|y
2620 if ($path =~ /^\*(.*)$/) {
2621 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2622 my $ob = $obs[rand @obs];
2623
2624 # see if we actually can go there
2625 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2626 $ob = $obs[rand @obs];
2627 } else {
2628 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2629 }
2630 # else put us there anyways for now #d#
2631
2632 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2633 } else {
2634 ($path, $x, $y) = (undef, undef, undef);
2635 }
2636 }
2637
2364 my $map = eval { 2638 my $map = eval {
2365 my $map = cf::map::find $path; 2639 my $map = defined $path ? cf::map::find $path : undef;
2366 2640
2367 if ($map) { 2641 if ($map) {
2368 $map = $map->customise_for ($self); 2642 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2643 $map = $check->($map) if $check && $map;
2370 } else { 2644 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2645 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2646 }
2373 2647
2374 $map 2648 $map
2375 }; 2649 };
2376 2650
… …
2412} 2686}
2413 2687
2414sub prepare_random_map { 2688sub prepare_random_map {
2415 my ($exit) = @_; 2689 my ($exit) = @_;
2416 2690
2417 my $guard = cf::lock_acquire "exit_prepare:$exit";
2418
2419 # all this does is basically replace the /! path by 2691 # all this does is basically replace the /! path by
2420 # a new random map path (?random/...) with a seed 2692 # a new random map path (?random/...) with a seed
2421 # that depends on the exit object 2693 # that depends on the exit object
2422 2694
2423 my $rmp = parse_random_map_params $exit->msg; 2695 my $rmp = parse_random_map_params $exit->msg;
… …
2425 if ($exit->map) { 2697 if ($exit->map) {
2426 $rmp->{region} = $exit->region->name; 2698 $rmp->{region} = $exit->region->name;
2427 $rmp->{origin_map} = $exit->map->path; 2699 $rmp->{origin_map} = $exit->map->path;
2428 $rmp->{origin_x} = $exit->x; 2700 $rmp->{origin_x} = $exit->x;
2429 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2702
2703 $exit->map->touch;
2430 } 2704 }
2431 2705
2432 $rmp->{random_seed} ||= $exit->random_seed; 2706 $rmp->{random_seed} ||= $exit->random_seed;
2433 2707
2434 my $data = cf::to_json $rmp; 2708 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2435 my $md5 = Digest::MD5::md5_hex $data; 2709 my $md5 = Digest::MD5::md5_hex $data;
2436 my $meta = "$RANDOMDIR/$md5.meta"; 2710 my $meta = "$RANDOMDIR/$md5.meta";
2437 2711
2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2712 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439 aio_write $fh, 0, (length $data), $data, 0; 2713 aio_write $fh, 0, (length $data), $data, 0;
2440 undef $fh; 2714 undef $fh;
2441 aio_rename "$meta~", $meta; 2715 aio_rename "$meta~", $meta;
2442 2716
2717 my $slaying = "?random/$md5";
2718
2719 if ($exit->valid) {
2443 $exit->slaying ("?random/$md5"); 2720 $exit->slaying ("?random/$md5");
2444 $exit->msg (undef); 2721 $exit->msg (undef);
2722 }
2445 } 2723 }
2446} 2724}
2447 2725
2448sub cf::object::player::enter_exit { 2726sub cf::object::player::enter_exit {
2449 my ($self, $exit) = @_; 2727 my ($self, $exit) = @_;
2450 2728
2451 return unless $self->type == cf::PLAYER; 2729 return unless $self->type == cf::PLAYER;
2452 2730
2453 if ($exit->slaying eq "/!") {
2454 #TODO: this should de-fi-ni-te-ly not be a sync-job
2455 # the problem is that $exit might not survive long enough
2456 # so it needs to be done right now, right here
2457 cf::sync_job { prepare_random_map $exit };
2458 }
2459
2460 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2461 my $hp = $exit->stats->hp;
2462 my $sp = $exit->stats->sp;
2463
2464 $self->enter_link; 2731 $self->enter_link;
2465 2732
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2470 (async { 2733 (async {
2471 $self->deactivate_recursive; # just to be sure 2734 $Coro::current->{desc} = "enter_exit";
2735
2472 unless (eval { 2736 unless (eval {
2737 $self->deactivate_recursive; # just to be sure
2738
2739 # random map handling
2740 {
2741 my $guard = cf::lock_acquire "exit_prepare:$exit";
2742
2743 prepare_random_map $exit
2744 if $exit->slaying eq "/!";
2745 }
2746
2747 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2748 my $x = $exit->stats->hp;
2749 my $y = $exit->stats->sp;
2750
2473 $self->goto ($slaying, $hp, $sp); 2751 $self->goto ($map, $x, $y);
2474 2752
2753 # if exit is damned, update players death & WoR home-position
2754 $self->contr->savebed ($map, $x, $y)
2755 if $exit->flag (cf::FLAG_DAMNED);
2756
2475 1; 2757 1
2476 }) { 2758 }) {
2477 $self->message ("Something went wrong deep within the crossfire server. " 2759 $self->message ("Something went wrong deep within the deliantra server. "
2478 . "I'll try to bring you back to the map you were before. " 2760 . "I'll try to bring you back to the map you were before. "
2479 . "Please report this to the dungeon master!", 2761 . "Please report this to the dungeon master!",
2480 cf::NDI_UNIQUE | cf::NDI_RED); 2762 cf::NDI_UNIQUE | cf::NDI_RED);
2481 2763
2482 warn "ERROR in enter_exit: $@"; 2764 warn "ERROR in enter_exit: $@";
… …
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2792the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2793the message unless the client supports the msg packet.
2512 2794
2513=cut 2795=cut
2514 2796
2797# non-persistent channels (usually the info channel)
2798our %CHANNEL = (
2799 "c/motd" => {
2800 id => "infobox",
2801 title => "MOTD",
2802 reply => undef,
2803 tooltip => "The message of the day",
2804 },
2805 "c/identify" => {
2806 id => "infobox",
2807 title => "Identify",
2808 reply => undef,
2809 tooltip => "Items recently identified",
2810 },
2811 "c/examine" => {
2812 id => "infobox",
2813 title => "Examine",
2814 reply => undef,
2815 tooltip => "Signs and other items you examined",
2816 },
2817 "c/shopinfo" => {
2818 id => "infobox",
2819 title => "Shop Info",
2820 reply => undef,
2821 tooltip => "What your bargaining skill tells you about the shop",
2822 },
2823 "c/book" => {
2824 id => "infobox",
2825 title => "Book",
2826 reply => undef,
2827 tooltip => "The contents of a note or book",
2828 },
2829 "c/lookat" => {
2830 id => "infobox",
2831 title => "Look",
2832 reply => undef,
2833 tooltip => "What you saw there",
2834 },
2835 "c/who" => {
2836 id => "infobox",
2837 title => "Players",
2838 reply => undef,
2839 tooltip => "Shows players who are currently online",
2840 },
2841 "c/body" => {
2842 id => "infobox",
2843 title => "Body Parts",
2844 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available",
2846 },
2847 "c/statistics" => {
2848 id => "infobox",
2849 title => "Statistics",
2850 reply => undef,
2851 tooltip => "Shows your primary statistics",
2852 },
2853 "c/skills" => {
2854 id => "infobox",
2855 title => "Skills",
2856 reply => undef,
2857 tooltip => "Shows your experience per skill and item power",
2858 },
2859 "c/shopitems" => {
2860 id => "infobox",
2861 title => "Shop Items",
2862 reply => undef,
2863 tooltip => "Shows the items currently for sale in this shop",
2864 },
2865 "c/resistances" => {
2866 id => "infobox",
2867 title => "Resistances",
2868 reply => undef,
2869 tooltip => "Shows your resistances",
2870 },
2871 "c/pets" => {
2872 id => "infobox",
2873 title => "Pets",
2874 reply => undef,
2875 tooltip => "Shows information abotu your pets/a specific pet",
2876 },
2877 "c/perceiveself" => {
2878 id => "infobox",
2879 title => "Perceive Self",
2880 reply => undef,
2881 tooltip => "You gained detailed knowledge about yourself",
2882 },
2883 "c/uptime" => {
2884 id => "infobox",
2885 title => "Uptime",
2886 reply => undef,
2887 tooltip => "How long the server has been running since last restart",
2888 },
2889 "c/mapinfo" => {
2890 id => "infobox",
2891 title => "Map Info",
2892 reply => undef,
2893 tooltip => "Information related to the maps",
2894 },
2895 "c/party" => {
2896 id => "party",
2897 title => "Party",
2898 reply => "gsay ",
2899 tooltip => "Messages and chat related to your party",
2900 },
2901 "c/death" => {
2902 id => "death",
2903 title => "Death",
2904 reply => undef,
2905 tooltip => "Reason for and more info about your most recent death",
2906 },
2907 "c/say" => $SAY_CHANNEL,
2908 "c/chat" => $CHAT_CHANNEL,
2909);
2910
2515sub cf::client::send_msg { 2911sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2912 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2913
2518 $msg = $self->pl->expand_cfpod ($msg); 2914 $msg = $self->pl->expand_cfpod ($msg)
2915 unless $color & cf::NDI_VERBATIM;
2519 2916
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 2917 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521 2918
2919 # check predefined channels, for the benefit of C
2920 if ($CHANNEL{$channel}) {
2921 $channel = $CHANNEL{$channel};
2922
2923 $self->ext_msg (channel_info => $channel);
2924 $channel = $channel->{id};
2925
2522 if (ref $channel) { 2926 } elsif (ref $channel) {
2523 # send meta info to client, if not yet sent 2927 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2928 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2929 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2930 $self->ext_msg (channel_info => $channel);
2527 } 2931 }
… …
2529 $channel = $channel->{id}; 2933 $channel = $channel->{id};
2530 } 2934 }
2531 2935
2532 return unless @extra || length $msg; 2936 return unless @extra || length $msg;
2533 2937
2534 if ($self->can_msg) {
2535 # default colour, mask it out 2938 # default colour, mask it out
2536 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2939 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2537 if $color & cf::NDI_DEF; 2940 if $color & cf::NDI_DEF;
2538 2941
2539 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2942 my $pkt = "msg "
2943 . $self->{json_coder}->encode (
2540 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2944 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2541 } else { 2945 );
2542 if ($color >= 0) {
2543 # replace some tags by gcfclient-compatible ones
2544 for ($msg) {
2545 1 while
2546 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2547 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2548 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2549 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 }
2552 2946
2553 $color &= cf::NDI_COLOR_MASK; 2947 # try lzf for large packets
2948 $pkt = "lzf " . Compress::LZF::compress $pkt
2949 if 1024 <= length $pkt and $self->{can_lzf};
2554 2950
2555 if (0 && $msg =~ /\[/) { 2951 # split very large packets
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2952 if (8192 < length $pkt and $self->{can_lzf}) {
2557 } else { 2953 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2954 $pkt = "frag";
2559 $self->send_packet ("drawinfo $color $msg")
2560 }
2561 }
2562 } 2955 }
2956
2957 $self->send_packet ($pkt);
2563} 2958}
2564 2959
2565=item $client->ext_msg ($type, @msg) 2960=item $client->ext_msg ($type, @msg)
2566 2961
2567Sends an ext event to the client. 2962Sends an ext event to the client.
… …
2569=cut 2964=cut
2570 2965
2571sub cf::client::ext_msg($$@) { 2966sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2967 my ($self, $type, @msg) = @_;
2573 2968
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2969 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2970 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2971 } elsif ($self->extcmd == 1) { # TODO: remove
2579 push @msg, msgtype => "event_$type"; 2972 push @msg, msgtype => "event_$type";
2973 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2974 }
2975}
2976
2977=item $client->ext_reply ($msgid, @msg)
2978
2979Sends an ext reply to the client.
2980
2981=cut
2982
2983sub cf::client::ext_reply($$@) {
2984 my ($self, $id, @msg) = @_;
2985
2986 if ($self->extcmd == 2) {
2987 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2988 } elsif ($self->extcmd == 1) {
2989 #TODO: version 1, remove
2990 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2992 }
2582} 2993}
2583 2994
2584=item $success = $client->query ($flags, "text", \&cb) 2995=item $success = $client->query ($flags, "text", \&cb)
… …
2646 my ($type, $reply, @payload) = 3057 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 3058 "ARRAY" eq ref $msg
2648 ? @$msg 3059 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3060 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 3061
3062 my @reply;
3063
2651 if (my $cb = $EXTICMD{$type}) { 3064 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 3065 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 3066 }
3067
3068 $ns->ext_reply ($reply, @reply)
3069 if $reply;
3070
2657 } else { 3071 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3072 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 3073 }
2660 3074
2661 cf::override; 3075 cf::override;
… …
2708our $safe = new Safe "safe"; 3122our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 3123our $safe_hole = new Safe::Hole;
2710 3124
2711$SIG{FPE} = 'IGNORE'; 3125$SIG{FPE} = 'IGNORE';
2712 3126
2713$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3127$safe->permit_only (Opcode::opset qw(
3128 :base_core :base_mem :base_orig :base_math
3129 grepstart grepwhile mapstart mapwhile
3130 sort time
3131));
2714 3132
2715# here we export the classes and methods available to script code 3133# here we export the classes and methods available to script code
2716 3134
2717=pod 3135=pod
2718 3136
2719The following functions and methods are available within a safe environment: 3137The following functions and methods are available within a safe environment:
2720 3138
2721 cf::object 3139 cf::object
2722 contr pay_amount pay_player map x y force_find force_add 3140 contr pay_amount pay_player map x y force_find force_add destroy
2723 insert remove 3141 insert remove name archname title slaying race decrease split
3142 value
2724 3143
2725 cf::object::player 3144 cf::object::player
2726 player 3145 player
2727 3146
2728 cf::player 3147 cf::player
… …
2733 3152
2734=cut 3153=cut
2735 3154
2736for ( 3155for (
2737 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3156 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2738 insert remove)], 3157 insert remove inv nrof name archname title slaying race
3158 decrease split destroy change_exp value msg lore send_msg)],
2739 ["cf::object::player" => qw(player)], 3159 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 3160 ["cf::player" => qw(peaceful send_msg)],
2741 ["cf::map" => qw(trigger)], 3161 ["cf::map" => qw(trigger)],
2742) { 3162) {
2743 no strict 'refs'; 3163 no strict 'refs';
2744 my ($pkg, @funs) = @$_; 3164 my ($pkg, @funs) = @$_;
2745 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3165 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2762 my ($code, %vars) = @_; 3182 my ($code, %vars) = @_;
2763 3183
2764 my $qcode = $code; 3184 my $qcode = $code;
2765 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3185 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2766 $qcode =~ s/\n/\\n/g; 3186 $qcode =~ s/\n/\\n/g;
3187
3188 %vars = (_dummy => 0) unless %vars;
2767 3189
2768 local $_; 3190 local $_;
2769 local @safe::cf::_safe_eval_args = values %vars; 3191 local @safe::cf::_safe_eval_args = values %vars;
2770 3192
2771 my $eval = 3193 my $eval =
… …
2819# the server's init and main functions 3241# the server's init and main functions
2820 3242
2821sub load_facedata($) { 3243sub load_facedata($) {
2822 my ($path) = @_; 3244 my ($path) = @_;
2823 3245
3246 # HACK to clear player env face cache, we need some signal framework
3247 # for this (global event?)
3248 %ext::player_env::MUSIC_FACE_CACHE = ();
3249
3250 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3251
2824 warn "loading facedata from $path\n"; 3252 warn "loading facedata from $path\n";
2825 3253
2826 my $facedata; 3254 my $facedata;
2827 0 < aio_load $path, $facedata 3255 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 3256 or die "$path: $!";
… …
2830 $facedata = Coro::Storable::thaw $facedata; 3258 $facedata = Coro::Storable::thaw $facedata;
2831 3259
2832 $facedata->{version} == 2 3260 $facedata->{version} == 2
2833 or cf::cleanup "$path: version mismatch, cannot proceed."; 3261 or cf::cleanup "$path: version mismatch, cannot proceed.";
2834 3262
3263 # patch in the exptable
3264 $facedata->{resource}{"res/exp_table"} = {
3265 type => FT_RSRC,
3266 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3267 };
3268 cf::cede_to_tick;
3269
2835 { 3270 {
2836 my $faces = $facedata->{faceinfo}; 3271 my $faces = $facedata->{faceinfo};
2837 3272
2838 while (my ($face, $info) = each %$faces) { 3273 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3274 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3275
2840 cf::face::set_visibility $idx, $info->{visibility}; 3276 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 3277 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3278 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3279 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 3280
2845 cf::cede_to_tick; 3281 cf::cede_to_tick;
2846 } 3282 }
2847 3283
2848 while (my ($face, $info) = each %$faces) { 3284 while (my ($face, $info) = each %$faces) {
2849 next unless $info->{smooth}; 3285 next unless $info->{smooth};
3286
2850 my $idx = cf::face::find $face 3287 my $idx = cf::face::find $face
2851 or next; 3288 or next;
3289
2852 if (my $smooth = cf::face::find $info->{smooth}) { 3290 if (my $smooth = cf::face::find $info->{smooth}) {
2853 cf::face::set_smooth $idx, $smooth; 3291 cf::face::set_smooth $idx, $smooth;
2854 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3292 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2855 } else { 3293 } else {
2856 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3294 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2873 3311
2874 { 3312 {
2875 # TODO: for gcfclient pleasure, we should give resources 3313 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 3314 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 3315 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881 3316
2882 while (my ($name, $info) = each %$res) { 3317 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({ 3318 if (defined $info->{type}) {
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3319 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3320 my $data;
2889 3321
2890 if ($info->{type} & 1) { 3322 if ($info->{type} & 1) {
2891 # prepend meta info 3323 # prepend meta info
2892 3324
3325 my $meta = $enc->encode ({
3326 name => $name,
3327 %{ $info->{meta} || {} },
3328 });
3329
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 3330 $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3331 } else {
3332 $data = $info->{data};
3333 }
2895 3334
2896 cf::face::set_data $idx, 0, $data, $chk; 3335 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3336 cf::face::set_type $idx, $info->{type};
2897 } else { 3337 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3338 $RESOURCE{$name} = $info;
2899 } 3339 }
2900 3340
2901 cf::face::set_type $idx, $info->{type};
2902
2903 cf::cede_to_tick; 3341 cf::cede_to_tick;
2904 } 3342 }
2905
2906 if ($soundconf) {
2907 $soundconf = $enc->decode (delete $soundconf->{data});
2908
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_]
2911 or next;
2912
2913 my $face = cf::face::find "sound/$sound->[1]";
2914
2915 cf::sound::set $sound->[0] => $face;
2916 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2917 }
2918
2919 #TODO
2920 }
2921 } 3343 }
3344
3345 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2922 3346
2923 1 3347 1
2924} 3348}
3349
3350cf::global->attach (on_resource_update => sub {
3351 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3352 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3353
3354 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3355 my $sound = $soundconf->{compat}[$_]
3356 or next;
3357
3358 my $face = cf::face::find "sound/$sound->[1]";
3359 cf::sound::set $sound->[0] => $face;
3360 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3361 }
3362
3363 while (my ($k, $v) = each %{$soundconf->{event}}) {
3364 my $face = cf::face::find "sound/$v";
3365 cf::sound::set $k => $face;
3366 }
3367 }
3368});
2925 3369
2926register_exticmd fx_want => sub { 3370register_exticmd fx_want => sub {
2927 my ($ns, $want) = @_; 3371 my ($ns, $want) = @_;
2928 3372
2929 while (my ($k, $v) = each %$want) { 3373 while (my ($k, $v) = each %$want) {
2930 $ns->fx_want ($k, $v); 3374 $ns->fx_want ($k, $v);
2931 } 3375 }
2932}; 3376};
2933 3377
3378sub load_resource_file($) {
3379 my $guard = lock_acquire "load_resource_file";
3380
3381 my $status = load_resource_file_ $_[0];
3382 get_slot 0.1, 100;
3383 cf::arch::commit_load;
3384
3385 $status
3386}
3387
2934sub reload_regions { 3388sub reload_regions {
3389 # HACK to clear player env face cache, we need some signal framework
3390 # for this (global event?)
3391 %ext::player_env::MUSIC_FACE_CACHE = ();
3392
2935 load_resource_file "$MAPDIR/regions" 3393 load_resource_file "$MAPDIR/regions"
2936 or die "unable to load regions file\n"; 3394 or die "unable to load regions file\n";
2937 3395
2938 for (cf::region::list) { 3396 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/ 3397 $_->{match} = qr/$_->{match}/
… …
2947} 3405}
2948 3406
2949sub reload_archetypes { 3407sub reload_archetypes {
2950 load_resource_file "$DATADIR/archetypes" 3408 load_resource_file "$DATADIR/archetypes"
2951 or die "unable to load archetypes\n"; 3409 or die "unable to load archetypes\n";
2952 #d# NEED to laod twice to resolve forward references
2953 # this really needs to be done in an extra post-pass
2954 # (which needs to be synchronous, so solve it differently)
2955 load_resource_file "$DATADIR/archetypes"
2956 or die "unable to load archetypes\n";
2957} 3410}
2958 3411
2959sub reload_treasures { 3412sub reload_treasures {
2960 load_resource_file "$DATADIR/treasures" 3413 load_resource_file "$DATADIR/treasures"
2961 or die "unable to load treasurelists\n"; 3414 or die "unable to load treasurelists\n";
2962} 3415}
2963 3416
2964sub reload_resources { 3417sub reload_resources {
2965 warn "reloading resource files...\n"; 3418 warn "reloading resource files...\n";
2966 3419
3420 reload_facedata;
3421 reload_archetypes;
2967 reload_regions; 3422 reload_regions;
2968 reload_facedata;
2969 #reload_archetypes;#d#
2970 reload_archetypes;
2971 reload_treasures; 3423 reload_treasures;
2972 3424
2973 warn "finished reloading resource files\n"; 3425 warn "finished reloading resource files\n";
2974} 3426}
2975 3427
2976sub init { 3428sub reload_config {
2977 reload_resources; 3429 warn "reloading config file...\n";
2978}
2979 3430
2980sub cfg_load {
2981 open my $fh, "<:utf8", "$CONFDIR/config" 3431 open my $fh, "<:utf8", "$CONFDIR/config"
2982 or return; 3432 or return;
2983 3433
2984 local $/; 3434 local $/;
2985 *CFG = YAML::Syck::Load <$fh>; 3435 *CFG = YAML::XS::Load scalar <$fh>;
2986 3436
2987 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3437 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2988 3438
2989 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3439 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2990 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3440 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2994 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3444 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2995 and die "WARNING: m(un)lockall failed: $!\n"; 3445 and die "WARNING: m(un)lockall failed: $!\n";
2996 }; 3446 };
2997 warn $@ if $@; 3447 warn $@ if $@;
2998 } 3448 }
3449
3450 warn "finished reloading resource files\n";
3451}
3452
3453sub pidfile() {
3454 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3455 or die "$PIDFILE: $!";
3456 flock $fh, &Fcntl::LOCK_EX
3457 or die "$PIDFILE: flock: $!";
3458 $fh
3459}
3460
3461# make sure only one server instance is running at any one time
3462sub atomic {
3463 my $fh = pidfile;
3464
3465 my $pid = <$fh>;
3466 kill 9, $pid if $pid > 0;
3467
3468 seek $fh, 0, 0;
3469 print $fh $$;
3470}
3471
3472sub main_loop {
3473 warn "EV::loop starting\n";
3474 if (1) {
3475 EV::loop;
3476 }
3477 warn "EV::loop returned\n";
3478 goto &main_loop unless $REALLY_UNLOOP;
2999} 3479}
3000 3480
3001sub main { 3481sub main {
3482 cf::init_globals; # initialise logging
3483
3484 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3485 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3486 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3487 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3488
3489 cf::init_experience;
3490 cf::init_anim;
3491 cf::init_attackmess;
3492 cf::init_dynamic;
3493
3494 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3495
3002 # we must not ever block the main coroutine 3496 # we must not ever block the main coroutine
3003 local $Coro::idle = sub { 3497 local $Coro::idle = sub {
3004 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3498 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3005 (async { 3499 (async {
3006 Event::one_event; 3500 $Coro::current->{desc} = "IDLE BUG HANDLER";
3501 EV::loop EV::LOOP_ONESHOT;
3007 })->prio (Coro::PRIO_MAX); 3502 })->prio (Coro::PRIO_MAX);
3008 }; 3503 };
3009 3504
3010 cfg_load; 3505 evthread_start IO::AIO::poll_fileno;
3506
3507 cf::sync_job {
3508 reload_resources;
3509 reload_config;
3011 db_init; 3510 db_init;
3511
3512 cf::load_settings;
3513 cf::load_materials;
3514 cf::init_uuid;
3515 cf::init_signals;
3516 cf::init_commands;
3517 cf::init_skills;
3518
3519 cf::init_beforeplay;
3520
3521 atomic;
3522
3012 load_extensions; 3523 load_extensions;
3013 3524
3014 $TICK_WATCHER->start; 3525 utime time, time, $RUNTIMEFILE;
3015 Event::loop; 3526
3527 # no (long-running) fork's whatsoever before this point(!)
3528 use POSIX ();
3529 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3530
3531 (pop @POST_INIT)->(0) while @POST_INIT;
3532 };
3533
3534 main_loop;
3016} 3535}
3017 3536
3018############################################################################# 3537#############################################################################
3019# initialisation and cleanup 3538# initialisation and cleanup
3020 3539
3021# install some emergency cleanup handlers 3540# install some emergency cleanup handlers
3022BEGIN { 3541BEGIN {
3542 our %SIGWATCHER = ();
3023 for my $signal (qw(INT HUP TERM)) { 3543 for my $signal (qw(INT HUP TERM)) {
3024 Event->signal ( 3544 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3025 reentrant => 0,
3026 data => WF_AUTOCANCEL,
3027 signal => $signal,
3028 prio => 0,
3029 cb => sub {
3030 cf::cleanup "SIG$signal"; 3545 cf::cleanup "SIG$signal";
3031 },
3032 ); 3546 };
3033 } 3547 }
3034} 3548}
3035 3549
3036sub write_runtime { 3550sub write_runtime_sync {
3037 my $runtime = "$LOCALDIR/runtime";
3038
3039 # first touch the runtime file to show we are still running: 3551 # first touch the runtime file to show we are still running:
3040 # the fsync below can take a very very long time. 3552 # the fsync below can take a very very long time.
3041 3553
3042 IO::AIO::aio_utime $runtime, undef, undef; 3554 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3043 3555
3044 my $guard = cf::lock_acquire "write_runtime"; 3556 my $guard = cf::lock_acquire "write_runtime";
3045 3557
3046 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3558 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3047 or return; 3559 or return;
3048 3560
3049 my $value = $cf::RUNTIME + 90 + 10; 3561 my $value = $cf::RUNTIME + 90 + 10;
3050 # 10 is the runtime save interval, for a monotonic clock 3562 # 10 is the runtime save interval, for a monotonic clock
3051 # 60 allows for the watchdog to kill the server. 3563 # 60 allows for the watchdog to kill the server.
… …
3061 aio_utime $fh, undef, undef; 3573 aio_utime $fh, undef, undef;
3062 3574
3063 close $fh 3575 close $fh
3064 or return; 3576 or return;
3065 3577
3066 aio_rename "$runtime~", $runtime 3578 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3067 and return; 3579 and return;
3068 3580
3069 warn "runtime file written.\n"; 3581 warn "runtime file written.\n";
3070 3582
3071 1 3583 1
3584}
3585
3586our $uuid_lock;
3587our $uuid_skip;
3588
3589sub write_uuid_sync($) {
3590 $uuid_skip ||= $_[0];
3591
3592 return if $uuid_lock;
3593 local $uuid_lock = 1;
3594
3595 my $uuid = "$LOCALDIR/uuid";
3596
3597 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3598 or return;
3599
3600 my $value = uuid_seq uuid_cur;
3601
3602 unless ($value) {
3603 warn "cowardly refusing to write zero uuid value!\n";
3604 return;
3605 }
3606
3607 my $value = uuid_str $value + $uuid_skip;
3608 $uuid_skip = 0;
3609
3610 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3611 and return;
3612
3613 # always fsync - this file is important
3614 aio_fsync $fh
3615 and return;
3616
3617 close $fh
3618 or return;
3619
3620 aio_rename "$uuid~", $uuid
3621 and return;
3622
3623 warn "uuid file written ($value).\n";
3624
3625 1
3626
3627}
3628
3629sub write_uuid($$) {
3630 my ($skip, $sync) = @_;
3631
3632 $sync ? write_uuid_sync $skip
3633 : async { write_uuid_sync $skip };
3072} 3634}
3073 3635
3074sub emergency_save() { 3636sub emergency_save() {
3075 my $freeze_guard = cf::freeze_mainloop; 3637 my $freeze_guard = cf::freeze_mainloop;
3076 3638
3077 warn "enter emergency perl save\n"; 3639 warn "emergency_perl_save: enter\n";
3078 3640
3079 cf::sync_job { 3641 cf::sync_job {
3642 # this is a trade-off: we want to be very quick here, so
3643 # save all maps without fsync, and later call a global sync
3644 # (which in turn might be very very slow)
3645 local $USE_FSYNC = 0;
3646
3080 # use a peculiar iteration method to avoid tripping on perl 3647 # use a peculiar iteration method to avoid tripping on perl
3081 # refcount bugs in for. also avoids problems with players 3648 # refcount bugs in for. also avoids problems with players
3082 # and maps saved/destroyed asynchronously. 3649 # and maps saved/destroyed asynchronously.
3083 warn "begin emergency player save\n"; 3650 warn "emergency_perl_save: begin player save\n";
3084 for my $login (keys %cf::PLAYER) { 3651 for my $login (keys %cf::PLAYER) {
3085 my $pl = $cf::PLAYER{$login} or next; 3652 my $pl = $cf::PLAYER{$login} or next;
3086 $pl->valid or next; 3653 $pl->valid or next;
3654 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3087 $pl->save; 3655 $pl->save;
3088 } 3656 }
3089 warn "end emergency player save\n"; 3657 warn "emergency_perl_save: end player save\n";
3090 3658
3091 warn "begin emergency map save\n"; 3659 warn "emergency_perl_save: begin map save\n";
3092 for my $path (keys %cf::MAP) { 3660 for my $path (keys %cf::MAP) {
3093 my $map = $cf::MAP{$path} or next; 3661 my $map = $cf::MAP{$path} or next;
3094 $map->valid or next; 3662 $map->valid or next;
3095 $map->save; 3663 $map->save;
3096 } 3664 }
3097 warn "end emergency map save\n"; 3665 warn "emergency_perl_save: end map save\n";
3098 3666
3099 warn "begin emergency database checkpoint\n"; 3667 warn "emergency_perl_save: begin database checkpoint\n";
3100 BDB::db_env_txn_checkpoint $DB_ENV; 3668 BDB::db_env_txn_checkpoint $DB_ENV;
3101 warn "end emergency database checkpoint\n"; 3669 warn "emergency_perl_save: end database checkpoint\n";
3670
3671 warn "emergency_perl_save: begin write uuid\n";
3672 write_uuid_sync 1;
3673 warn "emergency_perl_save: end write uuid\n";
3102 }; 3674 };
3103 3675
3676 warn "emergency_perl_save: starting sync()\n";
3677 IO::AIO::aio_sync sub {
3678 warn "emergency_perl_save: finished sync()\n";
3679 };
3680
3104 warn "leave emergency perl save\n"; 3681 warn "emergency_perl_save: leave\n";
3105} 3682}
3106 3683
3107sub post_cleanup { 3684sub post_cleanup {
3108 my ($make_core) = @_; 3685 my ($make_core) = @_;
3109 3686
3110 warn Carp::longmess "post_cleanup backtrace" 3687 warn Carp::longmess "post_cleanup backtrace"
3111 if $make_core; 3688 if $make_core;
3689
3690 my $fh = pidfile;
3691 unlink $PIDFILE if <$fh> == $$;
3692}
3693
3694# a safer delete_package, copied from Symbol
3695sub clear_package($) {
3696 my $pkg = shift;
3697
3698 # expand to full symbol table name if needed
3699 unless ($pkg =~ /^main::.*::$/) {
3700 $pkg = "main$pkg" if $pkg =~ /^::/;
3701 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3702 $pkg .= '::' unless $pkg =~ /::$/;
3703 }
3704
3705 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3706 my $stem_symtab = *{$stem}{HASH};
3707
3708 defined $stem_symtab and exists $stem_symtab->{$leaf}
3709 or return;
3710
3711 # clear all symbols
3712 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3713 for my $name (keys %$leaf_symtab) {
3714 _gv_clear *{"$pkg$name"};
3715# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3716 }
3717 warn "cleared package $pkg\n";#d#
3112} 3718}
3113 3719
3114sub do_reload_perl() { 3720sub do_reload_perl() {
3115 # can/must only be called in main 3721 # can/must only be called in main
3116 if ($Coro::current != $Coro::main) { 3722 if ($Coro::current != $Coro::main) {
3117 warn "can only reload from main coroutine"; 3723 warn "can only reload from main coroutine";
3118 return; 3724 return;
3119 } 3725 }
3120 3726
3727 return if $RELOAD++;
3728
3729 my $t1 = EV::time;
3730
3731 while ($RELOAD) {
3121 warn "reloading..."; 3732 warn "reloading...";
3122 3733
3123 warn "entering sync_job"; 3734 warn "entering sync_job";
3124 3735
3125 cf::sync_job { 3736 cf::sync_job {
3126 cf::write_runtime; # external watchdog should not bark 3737 cf::write_runtime_sync; # external watchdog should not bark
3127 cf::emergency_save; 3738 cf::emergency_save;
3128 cf::write_runtime; # external watchdog should not bark 3739 cf::write_runtime_sync; # external watchdog should not bark
3129 3740
3130 warn "syncing database to disk"; 3741 warn "syncing database to disk";
3131 BDB::db_env_txn_checkpoint $DB_ENV; 3742 BDB::db_env_txn_checkpoint $DB_ENV;
3132 3743
3133 # if anything goes wrong in here, we should simply crash as we already saved 3744 # if anything goes wrong in here, we should simply crash as we already saved
3134 3745
3135 warn "cancelling all WF_AUTOCANCEL watchers";
3136 for (Event::all_watchers) {
3137 $_->cancel if $_->data & WF_AUTOCANCEL;
3138 }
3139
3140 warn "flushing outstanding aio requests"; 3746 warn "flushing outstanding aio requests";
3141 for (;;) {
3142 BDB::flush;
3143 IO::AIO::flush;
3144 Coro::cede;
3145 last unless IO::AIO::nreqs || BDB::nreqs; 3747 while (IO::AIO::nreqs || BDB::nreqs) {
3146 warn "iterate..."; 3748 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3147 }
3148
3149 ++$RELOAD;
3150
3151 warn "cancelling all extension coros";
3152 $_->cancel for values %EXT_CORO;
3153 %EXT_CORO = ();
3154
3155 warn "removing commands";
3156 %COMMAND = ();
3157
3158 warn "removing ext/exti commands";
3159 %EXTCMD = ();
3160 %EXTICMD = ();
3161
3162 warn "unloading/nuking all extensions";
3163 for my $pkg (@EXTS) {
3164 warn "... unloading $pkg";
3165
3166 if (my $cb = $pkg->can ("unload")) {
3167 eval {
3168 $cb->($pkg);
3169 1
3170 } or warn "$pkg unloaded, but with errors: $@";
3171 } 3749 }
3172 3750
3173 warn "... nuking $pkg"; 3751 warn "cancelling all extension coros";
3174 Symbol::delete_package $pkg; 3752 $_->cancel for values %EXT_CORO;
3175 } 3753 %EXT_CORO = ();
3176 3754
3177 warn "unloading all perl modules loaded from $LIBDIR"; 3755 warn "removing commands";
3178 while (my ($k, $v) = each %INC) { 3756 %COMMAND = ();
3179 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3180 3757
3758 warn "removing ext/exti commands";
3759 %EXTCMD = ();
3760 %EXTICMD = ();
3761
3762 warn "unloading/nuking all extensions";
3763 for my $pkg (@EXTS) {
3181 warn "... unloading $k"; 3764 warn "... unloading $pkg";
3182 delete $INC{$k};
3183 3765
3184 $k =~ s/\.pm$//;
3185 $k =~ s/\//::/g;
3186
3187 if (my $cb = $k->can ("unload_module")) { 3766 if (my $cb = $pkg->can ("unload")) {
3767 eval {
3188 $cb->(); 3768 $cb->($pkg);
3769 1
3770 } or warn "$pkg unloaded, but with errors: $@";
3771 }
3772
3773 warn "... clearing $pkg";
3774 clear_package $pkg;
3189 } 3775 }
3190 3776
3191 Symbol::delete_package $k; 3777 warn "unloading all perl modules loaded from $LIBDIR";
3778 while (my ($k, $v) = each %INC) {
3779 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3780
3781 warn "... unloading $k";
3782 delete $INC{$k};
3783
3784 $k =~ s/\.pm$//;
3785 $k =~ s/\//::/g;
3786
3787 if (my $cb = $k->can ("unload_module")) {
3788 $cb->();
3789 }
3790
3791 clear_package $k;
3192 } 3792 }
3193 3793
3194 warn "getting rid of safe::, as good as possible"; 3794 warn "getting rid of safe::, as good as possible";
3195 Symbol::delete_package "safe::$_" 3795 clear_package "safe::$_"
3196 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3796 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3197 3797
3198 warn "unloading cf.pm \"a bit\""; 3798 warn "unloading cf.pm \"a bit\"";
3199 delete $INC{"cf.pm"}; 3799 delete $INC{"cf.pm"};
3200 delete $INC{"cf/pod.pm"}; 3800 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3201 3801
3202 # don't, removes xs symbols, too, 3802 # don't, removes xs symbols, too,
3203 # and global variables created in xs 3803 # and global variables created in xs
3204 #Symbol::delete_package __PACKAGE__; 3804 #clear_package __PACKAGE__;
3205 3805
3206 warn "unload completed, starting to reload now"; 3806 warn "unload completed, starting to reload now";
3207 3807
3208 warn "reloading cf.pm"; 3808 warn "reloading cf.pm";
3209 require cf; 3809 require cf;
3210 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3810 cf::_connect_to_perl_1;
3211 3811
3212 warn "loading config and database again"; 3812 warn "loading config and database again";
3213 cf::cfg_load; 3813 cf::reload_config;
3214 3814
3215 warn "loading extensions"; 3815 warn "loading extensions";
3216 cf::load_extensions; 3816 cf::load_extensions;
3217 3817
3818 if ($REATTACH_ON_RELOAD) {
3218 warn "reattaching attachments to objects/players"; 3819 warn "reattaching attachments to objects/players";
3219 _global_reattach; # objects, sockets 3820 _global_reattach; # objects, sockets
3220 warn "reattaching attachments to maps"; 3821 warn "reattaching attachments to maps";
3221 reattach $_ for values %MAP; 3822 reattach $_ for values %MAP;
3222 warn "reattaching attachments to players"; 3823 warn "reattaching attachments to players";
3223 reattach $_ for values %PLAYER; 3824 reattach $_ for values %PLAYER;
3825 }
3224 3826
3827 warn "running post_init jobs";
3828 (pop @POST_INIT)->(1) while @POST_INIT;
3829
3225 warn "leaving sync_job"; 3830 warn "leaving sync_job";
3226 3831
3227 1 3832 1
3228 } or do { 3833 } or do {
3229 warn $@; 3834 warn $@;
3230 warn "error while reloading, exiting."; 3835 cf::cleanup "error while reloading, exiting.";
3231 exit 1;
3232 }; 3836 };
3233 3837
3234 warn "reloaded"; 3838 warn "reloaded";
3839 --$RELOAD;
3840 }
3841
3842 $t1 = EV::time - $t1;
3843 warn "reload completed in ${t1}s\n";
3235}; 3844};
3236 3845
3237our $RELOAD_WATCHER; # used only during reload 3846our $RELOAD_WATCHER; # used only during reload
3238 3847
3239sub reload_perl() { 3848sub reload_perl() {
3240 # doing reload synchronously and two reloads happen back-to-back, 3849 # doing reload synchronously and two reloads happen back-to-back,
3241 # coro crashes during coro_state_free->destroy here. 3850 # coro crashes during coro_state_free->destroy here.
3242 3851
3243 $RELOAD_WATCHER ||= Event->timer ( 3852 $RELOAD_WATCHER ||= cf::async {
3244 reentrant => 0, 3853 Coro::AIO::aio_wait cache_extensions;
3245 after => 0, 3854
3246 data => WF_AUTOCANCEL, 3855 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3247 cb => sub {
3248 do_reload_perl; 3856 do_reload_perl;
3249 undef $RELOAD_WATCHER; 3857 undef $RELOAD_WATCHER;
3250 }, 3858 };
3251 ); 3859 };
3252} 3860}
3253 3861
3254register_command "reload" => sub { 3862register_command "reload" => sub {
3255 my ($who, $arg) = @_; 3863 my ($who, $arg) = @_;
3256 3864
3257 if ($who->flag (FLAG_WIZ)) { 3865 if ($who->flag (FLAG_WIZ)) {
3258 $who->message ("reloading server."); 3866 $who->message ("reloading server.");
3867 async {
3868 $Coro::current->{desc} = "perl_reload";
3259 async { reload_perl }; 3869 reload_perl;
3870 };
3260 } 3871 }
3261}; 3872};
3262 3873
3263unshift @INC, $LIBDIR; 3874unshift @INC, $LIBDIR;
3264 3875
… …
3266 3877
3267our @WAIT_FOR_TICK; 3878our @WAIT_FOR_TICK;
3268our @WAIT_FOR_TICK_BEGIN; 3879our @WAIT_FOR_TICK_BEGIN;
3269 3880
3270sub wait_for_tick { 3881sub wait_for_tick {
3271 return unless $TICK_WATCHER->is_active;
3272 return if $Coro::current == $Coro::main; 3882 return if tick_inhibit || $Coro::current == $Coro::main;
3273 3883
3274 my $signal = new Coro::Signal; 3884 my $signal = new Coro::Signal;
3275 push @WAIT_FOR_TICK, $signal; 3885 push @WAIT_FOR_TICK, $signal;
3276 $signal->wait; 3886 $signal->wait;
3277} 3887}
3278 3888
3279sub wait_for_tick_begin { 3889sub wait_for_tick_begin {
3280 return unless $TICK_WATCHER->is_active;
3281 return if $Coro::current == $Coro::main; 3890 return if tick_inhibit || $Coro::current == $Coro::main;
3282 3891
3283 my $signal = new Coro::Signal; 3892 my $signal = new Coro::Signal;
3284 push @WAIT_FOR_TICK_BEGIN, $signal; 3893 push @WAIT_FOR_TICK_BEGIN, $signal;
3285 $signal->wait; 3894 $signal->wait;
3286} 3895}
3287 3896
3288 my $min = 1e6;#d# 3897sub tick {
3289 my $avg = 10;
3290$TICK_WATCHER = Event->timer (
3291 reentrant => 0,
3292 parked => 1,
3293 prio => 0,
3294 at => $NEXT_TICK || $TICK,
3295 data => WF_AUTOCANCEL,
3296 cb => sub {
3297 if ($Coro::current != $Coro::main) { 3898 if ($Coro::current != $Coro::main) {
3298 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3899 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3299 unless ++$bug_warning > 10; 3900 unless ++$bug_warning > 10;
3300 return; 3901 return;
3301 } 3902 }
3302 3903
3303 $NOW = $tick_start = Event::time;
3304
3305 cf::server_tick; # one server iteration 3904 cf::server_tick; # one server iteration
3306 3905
3307 0 && sync_job {#d# 3906 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3308 for(1..10) { 3907 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3309 my $t = Event::time; 3908 Coro::async_pool {
3310 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3909 $Coro::current->{desc} = "runtime saver";
3311 or die; 3910 write_runtime_sync
3312 3911 or warn "ERROR: unable to write runtime file: $!";
3313 $map->width (50);
3314 $map->height (50);
3315 $map->alloc;
3316 $map->_load_objects ("/tmp/x.map", 1);
3317 my $t = Event::time - $t;
3318
3319 #next unless $t < 0.0013;#d#
3320 if ($t < $min) {
3321 $min = $t;
3322 }
3323 $avg = $avg * 0.99 + $t * 0.01;
3324 }
3325 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3326 exit 0;
3327 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3328 }; 3912 };
3913 }
3329 3914
3330 $RUNTIME += $TICK;
3331 $NEXT_TICK += $TICK;
3332
3333 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3334 $NEXT_RUNTIME_WRITE = $NOW + 10;
3335 Coro::async_pool {
3336 write_runtime
3337 or warn "ERROR: unable to write runtime file: $!";
3338 };
3339 }
3340
3341# my $AFTER = Event::time;
3342# warn $AFTER - $NOW;#d#
3343
3344 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3915 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3345 $sig->send; 3916 $sig->send;
3346 } 3917 }
3347 while (my $sig = shift @WAIT_FOR_TICK) { 3918 while (my $sig = shift @WAIT_FOR_TICK) {
3348 $sig->send; 3919 $sig->send;
3349 } 3920 }
3350 3921
3351 $NOW = Event::time; 3922 $LOAD = ($NOW - $TICK_START) / $TICK;
3352
3353 # if we are delayed by four ticks or more, skip them all
3354 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3355
3356 $TICK_WATCHER->at ($NEXT_TICK);
3357 $TICK_WATCHER->start;
3358
3359 $LOAD = ($NOW - $tick_start) / $TICK;
3360 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3923 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3361 3924
3362 _post_tick; 3925 if (0) {
3363 3926 if ($NEXT_TICK) {
3364 3927 my $jitter = $TICK_START - $NEXT_TICK;
3928 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3929 warn "jitter $JITTER\n";#d#
3930 }
3365 }, 3931 }
3366); 3932}
3367 3933
3368{ 3934{
3369 BDB::max_poll_time $TICK * 0.1; 3935 # configure BDB
3370 $BDB_POLL_WATCHER = Event->io ( 3936
3371 reentrant => 0,
3372 fd => BDB::poll_fileno,
3373 poll => 'r',
3374 prio => 0,
3375 data => WF_AUTOCANCEL,
3376 cb => \&BDB::poll_cb,
3377 );
3378 BDB::min_parallel 8; 3937 BDB::min_parallel 8;
3379 3938 BDB::max_poll_reqs $TICK * 0.1;
3380 BDB::set_sync_prepare { 3939 $AnyEvent::BDB::WATCHER->priority (1);
3381 my $status;
3382 my $current = $Coro::current;
3383 (
3384 sub {
3385 $status = $!;
3386 $current->ready; undef $current;
3387 },
3388 sub {
3389 Coro::schedule while defined $current;
3390 $! = $status;
3391 },
3392 )
3393 };
3394 3940
3395 unless ($DB_ENV) { 3941 unless ($DB_ENV) {
3396 $DB_ENV = BDB::db_env_create; 3942 $DB_ENV = BDB::db_env_create;
3943 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3944 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3945 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3946 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3947 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3397 3948
3398 cf::sync_job { 3949 cf::sync_job {
3399 eval { 3950 eval {
3400 BDB::db_env_open 3951 BDB::db_env_open
3401 $DB_ENV, 3952 $DB_ENV,
… …
3403 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3954 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3404 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3955 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3405 0666; 3956 0666;
3406 3957
3407 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3958 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3408
3409 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3410 $DB_ENV->set_lk_detect;
3411 }; 3959 };
3412 3960
3413 cf::cleanup "db_env_open(db): $@" if $@; 3961 cf::cleanup "db_env_open(db): $@" if $@;
3414 }; 3962 };
3415 } 3963 }
3964
3965 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3966 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3967 };
3968 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3969 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3970 };
3971 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3972 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3973 };
3416} 3974}
3417 3975
3418{ 3976{
3977 # configure IO::AIO
3978
3419 IO::AIO::min_parallel 8; 3979 IO::AIO::min_parallel 8;
3420
3421 undef $Coro::AIO::WATCHER;
3422 IO::AIO::max_poll_time $TICK * 0.1; 3980 IO::AIO::max_poll_time $TICK * 0.1;
3423 $AIO_POLL_WATCHER = Event->io ( 3981 undef $AnyEvent::AIO::WATCHER;
3424 reentrant => 0,
3425 data => WF_AUTOCANCEL,
3426 fd => IO::AIO::poll_fileno,
3427 poll => 'r',
3428 prio => 6,
3429 cb => \&IO::AIO::poll_cb,
3430 );
3431} 3982}
3432 3983
3433my $_log_backtrace; 3984my $_log_backtrace;
3434 3985
3435sub _log_backtrace { 3986sub _log_backtrace {
… …
3438 $msg =~ s/\n//; 3989 $msg =~ s/\n//;
3439 3990
3440 # limit the # of concurrent backtraces 3991 # limit the # of concurrent backtraces
3441 if ($_log_backtrace < 2) { 3992 if ($_log_backtrace < 2) {
3442 ++$_log_backtrace; 3993 ++$_log_backtrace;
3994 my $perl_bt = Carp::longmess $msg;
3443 async { 3995 async {
3996 $Coro::current->{desc} = "abt $msg";
3997
3444 my @bt = fork_call { 3998 my @bt = fork_call {
3445 @addr = map { sprintf "%x", $_ } @addr; 3999 @addr = map { sprintf "%x", $_ } @addr;
3446 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4000 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3447 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4001 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3448 or die "addr2line: $!"; 4002 or die "addr2line: $!";
… …
3456 } 4010 }
3457 4011
3458 @funcs 4012 @funcs
3459 }; 4013 };
3460 4014
3461 LOG llevInfo, "[ABT] $msg\n"; 4015 LOG llevInfo, "[ABT] $perl_bt\n";
4016 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3462 LOG llevInfo, "[ABT] $_\n" for @bt; 4017 LOG llevInfo, "[ABT] $_\n" for @bt;
3463 --$_log_backtrace; 4018 --$_log_backtrace;
3464 }; 4019 };
3465 } else { 4020 } else {
3466 LOG llevInfo, "[ABT] $msg\n"; 4021 LOG llevInfo, "[ABT] $msg\n";
3467 LOG llevInfo, "[ABT] [suppressed]\n"; 4022 LOG llevInfo, "[ABT] [suppressed]\n";
3468 } 4023 }
3469} 4024}
3470 4025
3471# load additional modules 4026# load additional modules
3472use cf::pod; 4027require "cf/$_.pm" for @EXTRA_MODULES;
4028cf::_connect_to_perl_2;
3473 4029
3474END { cf::emergency_save } 4030END { cf::emergency_save }
3475 4031
34761 40321
3477 4033

Diff Legend

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