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

Diff Legend

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