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.491 by root, Sat Oct 24 09:18:44 2009 UTC

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

Diff Legend

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