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

Diff Legend

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