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

Diff Legend

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