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

Diff Legend

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