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.169 by root, Sun Jan 14 01:09:46 2007 UTC vs.
Revision 1.357 by root, Tue Sep 4 08:42:58 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.3 (); 15use Coro 3.64 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
19 25
26use JSON::XS ();
27use BDB ();
20use Data::Dumper; 28use Data::Dumper;
21use Digest::MD5; 29use Digest::MD5;
22use Fcntl; 30use Fcntl;
31use YAML::Syck ();
23use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF;
35use Digest::MD5 ();
26 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 44
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
33 47
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
36our %COMMAND = (); 52our %COMMAND = ();
37our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
38 54
39our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
43 60
61our $RELOAD; # number of reloads so far
44our @EVENT; 62our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 63
47our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 77our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 80our $NEXT_TICK;
52our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off
83
84our $BDB_POLL_WATCHER;
85our $DB_ENV;
53 86
54our %CFG; 87our %CFG;
55 88
56our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 90our $RUNTIME;
58 91
59our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
60our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
61our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 95
67# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
70binmode STDOUT; 103binmode STDOUT;
71binmode STDERR; 104binmode STDERR;
72 105
73# read virtual server time, if available 106# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
78} 111}
79 112
80mkdir cf::localdir; 113mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 115
86our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
117
118sub cf::map::normalise;
87 119
88############################################################################# 120#############################################################################
89 121
90=head2 GLOBAL VARIABLES 122=head2 GLOBAL VARIABLES
91 123
98=item $cf::RUNTIME 130=item $cf::RUNTIME
99 131
100The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 133every server tick.
102 134
103=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 138
105The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
107 143
108=item $cf::NOW 144=item $cf::NOW
109 145
110The time of the last (current) server tick. 146The time of the last (current) server tick.
111 147
112=item $cf::TICK 148=item $cf::TICK
113 149
114The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
115 161
116=item %cf::CFG 162=item %cf::CFG
117 163
118Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 165from wherever your confdir points to.
120 166
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
122 168
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
127 178
128=back 179=back
129 180
130=cut 181=cut
131 182
132BEGIN { 183BEGIN {
133 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 185 my $msg = join "", @_;
135 utf8::encode $msg;
136 186
137 $msg .= "\n" 187 $msg .= "\n"
138 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
139 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
140 LOG llevError, $msg; 193 LOG llevError, $msg;
141 }; 194 };
142} 195}
143 196
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 204
151# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 206# within the Safe compartment.
153for my $pkg (qw( 207for my $pkg (qw(
154 cf::global cf::attachable 208 cf::global cf::attachable
162} 216}
163 217
164$Event::DIED = sub { 218$Event::DIED = sub {
165 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
166}; 220};
221
222#############################################################################
167 223
168=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
169 225
170=over 4 226=over 4
171 227
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 247 $d
192 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
193} 249}
194 250
195use JSON::Syck (); # TODO# replace by JSON::PC once working
196
197=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
198 252
199Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
200 254
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
209 256
210Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
211 258
212=cut 259=cut
213 260
214sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
216 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
217} 264sub from_json ($) { $json_coder->decode ($_[0]) }
218 265
219=item cf::lock_wait $string 266=item cf::lock_wait $string
220 267
221Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
222 269
225Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
226a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
227for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
228returned. 275returned.
229 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
230Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
232 286
233=cut 287=cut
234 288
235our %LOCK; 289our %LOCK;
236 290
256 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
258 } 312 }
259} 313}
260 314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
319}
320
261sub freeze_mainloop { 321sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
263 323
264 my $guard = Coro::guard { 324 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 326 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
270 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
271} 385}
272 386
273=item cf::async { BLOCK } 387=item cf::async { BLOCK }
274 388
275Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
280 394
281BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
282 396
283=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
284 398
285The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
288 403
289If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
292fast or be very important. 407fast or be very important.
295 410
296sub sync_job(&) { 411sub sync_job(&) {
297 my ($job) = @_; 412 my ($job) = @_;
298 413
299 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
300 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
302 419
303 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 421 # (but this is cancel-safe)
315 432
316 while ($busy) { 433 while ($busy) {
317 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
318 } 435 }
319 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
320 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
321 } else { 445 } else {
322 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
323 447
324 $job->() 448 $job->()
343 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
344 468
345 $coro 469 $coro
346} 470}
347 471
348sub write_runtime { 472=item fork_call { }, $args
349 my $runtime = cf::localdir . "/runtime";
350 473
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 474Executes the given code block with the given arguments in a seperate
352 or return; 475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
353 478
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 479=cut
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return;
357 480
358 aio_fsync $fh 481sub fork_call(&@) {
359 and return; 482 my ($cb, @args) = @_;
360 483
361 close $fh 484 # we seemingly have to make a local copy of the whole thing,
362 or return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (likely this will be rather laborious)
363 487
364 aio_rename "$runtime~", $runtime 488 my @res = Coro::Util::fork_eval {
365 and return; 489 reset_signals;
490 &$cb
491 }, @args;
366 492
493 wantarray ? @res : $res[-1]
494}
495
496=item $value = cf::db_get $family => $key
497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
367 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
610}
611
612=item cf::datalog type => key => value, ...
613
614Log a datalog packet of the given type with the given key-value pairs.
615
616=cut
617
618sub datalog($@) {
619 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
368} 621}
369 622
370=back 623=back
371 624
372=cut 625=cut
379attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
380to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
381 634
382In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
383C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
384crossfire+). 637Crossfire TRT).
385 638
386=over 4 639=over 4
387 640
388=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
389 642
503our @CB_TYPE = (); # registry for type (cf-object class) based events 756our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 757our @CB_MAP = ();
505 758
506my %attachment; 759my %attachment;
507 760
761sub cf::attachable::thawer_merge {
762 # simply override everything except _meta
763 local $_[0]{_meta};
764 %{$_[0]} = %{$_[1]};
765}
766
508sub _attach_cb($$$$) { 767sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 768 my ($registry, $event, $prio, $cb) = @_;
510 769
511 use sort 'stable'; 770 use sort 'stable';
512 771
546 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
547 806
548 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
549 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
550 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
551 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
552 811
553 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
554 my $pkg = shift @arg; 813 my $pkg = shift @arg;
555 814
556 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
585 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
586 } 845 }
587 846
588 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
589 } else { 848 } else {
590 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
591 } 850 }
592 851
593 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
594} 853}
595 854
597 if (ref $_[0]) { 856 if (ref $_[0]) {
598 _object_attach @_; 857 _object_attach @_;
599 } else { 858 } else {
600 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
601 } 860 }
861 _recalc_want;
602}; 862};
603 863
604# all those should be optimised 864# all those should be optimised
605sub cf::attachable::detach { 865sub cf::attachable::detach {
606 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
609 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
610 reattach ($obj); 870 reattach ($obj);
611 } else { 871 } else {
612 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
613 } 873 }
874 _recalc_want;
614}; 875};
615 876
616sub cf::attachable::attached { 877sub cf::attachable::attached {
617 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
618 879
633 "; 894 ";
634 die if $@; 895 die if $@;
635} 896}
636 897
637our $override; 898our $override;
638our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
639 900
640sub override { 901sub override {
641 $override = 1; 902 $override = 1;
642 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
643} 904}
644 905
645sub do_invoke { 906sub do_invoke {
646 my $event = shift; 907 my $event = shift;
647 my $callbacks = shift; 908 my $callbacks = shift;
648 909
649 @invoke_results = (); 910 @INVOKE_RESULTS = ();
650 911
651 local $override; 912 local $override;
652 913
653 for (@$callbacks) { 914 for (@$callbacks) {
654 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
671 932
672Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
673 934
674This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
675removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
676results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
677 938
678=back 939=back
679 940
680=cut 941=cut
681 942
682############################################################################# 943#############################################################################
683# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
684 956
685sub reattach { 957sub reattach {
686 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
687 my ($obj) = @_; 959 my ($obj) = @_;
688 960
733); 1005);
734 1006
735sub object_freezer_save { 1007sub object_freezer_save {
736 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
737 1009
1010 my $guard = cf::lock_acquire "io";
1011
738 sync_job { 1012 sync_job {
739 if (length $$rdata) { 1013 if (length $$rdata) {
740 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
741 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
742 1016
743 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
744 chmod SAVE_MODE, $fh; 1018 chmod SAVE_MODE, $fh;
745 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
746 aio_fsync $fh; 1020 aio_fsync $fh if $cf::USE_FSYNC;
747 close $fh; 1021 close $fh;
748 1022
749 if (@$objs) { 1023 if (@$objs) {
750 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1024 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
751 chmod SAVE_MODE, $fh; 1025 chmod SAVE_MODE, $fh;
752 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1026 my $data = Storable::nfreeze { version => 1, objs => $objs };
753 aio_write $fh, 0, (length $data), $data, 0; 1027 aio_write $fh, 0, (length $data), $data, 0;
754 aio_fsync $fh; 1028 aio_fsync $fh if $cf::USE_FSYNC;
755 close $fh; 1029 close $fh;
756 aio_rename "$filename.pst~", "$filename.pst"; 1030 aio_rename "$filename.pst~", "$filename.pst";
757 } 1031 }
758 } else { 1032 } else {
759 aio_unlink "$filename.pst"; 1033 aio_unlink "$filename.pst";
765 } 1039 }
766 } else { 1040 } else {
767 aio_unlink $filename; 1041 aio_unlink $filename;
768 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
769 } 1043 }
770 } 1044 };
1045
1046 undef $guard;
771} 1047}
772 1048
773sub object_freezer_as_string { 1049sub object_freezer_as_string {
774 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
775 1051
780 1056
781sub object_thawer_load { 1057sub object_thawer_load {
782 my ($filename) = @_; 1058 my ($filename) = @_;
783 1059
784 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
785 1063
786 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
787 or return; 1065 or return;
788 1066
789 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
790 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
791 or return; 1069 or return;
1070
1071 undef $guard;
792 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
793 } 1073 }
794 1074
795 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
796 $filename, length $data, scalar @{$av || []};#d# 1076 $filename, length $data, scalar @{$av || []};
1077
797 return ($data, $av); 1078 ($data, $av)
798} 1079}
1080
1081=head2 COMMAND CALLBACKS
1082
1083=over 4
1084
1085=cut
799 1086
800############################################################################# 1087#############################################################################
801# command handling &c 1088# command handling &c
802 1089
803=item cf::register_command $name => \&callback($ob,$args); 1090=item cf::register_command $name => \&callback($ob,$args);
816 push @{ $COMMAND{$name} }, [$caller, $cb]; 1103 push @{ $COMMAND{$name} }, [$caller, $cb];
817} 1104}
818 1105
819=item cf::register_extcmd $name => \&callback($pl,$packet); 1106=item cf::register_extcmd $name => \&callback($pl,$packet);
820 1107
821Register a callbackf ro execution when the client sends an extcmd packet. 1108Register a callback for execution when the client sends an (synchronous)
1109extcmd packet. Ext commands will be processed in the order they are
1110received by the server, like other user commands. The first argument is
1111the logged-in player. Ext commands can only be processed after a player
1112has logged in successfully.
822 1113
823If the callback returns something, it is sent back as if reply was being 1114If the callback returns something, it is sent back as if reply was being
824called. 1115called.
825 1116
1117=item cf::register_exticmd $name => \&callback($ns,$packet);
1118
1119Register a callback for execution when the client sends an (asynchronous)
1120exticmd packet. Exti commands are processed by the server as soon as they
1121are received, i.e. out of order w.r.t. other commands. The first argument
1122is a client socket. Exti commands can be received anytime, even before
1123log-in.
1124
1125If the callback returns something, it is sent back as if reply was being
1126called.
1127
826=cut 1128=cut
827 1129
828sub register_extcmd { 1130sub register_extcmd {
829 my ($name, $cb) = @_; 1131 my ($name, $cb) = @_;
830 1132
831 $EXTCMD{$name} = $cb; 1133 $EXTCMD{$name} = $cb;
1134}
1135
1136sub register_exticmd {
1137 my ($name, $cb) = @_;
1138
1139 $EXTICMD{$name} = $cb;
832} 1140}
833 1141
834cf::player->attach ( 1142cf::player->attach (
835 on_command => sub { 1143 on_command => sub {
836 my ($pl, $name, $params) = @_; 1144 my ($pl, $name, $params) = @_;
845 cf::override; 1153 cf::override;
846 }, 1154 },
847 on_extcmd => sub { 1155 on_extcmd => sub {
848 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
849 1157
850 my $msg = eval { from_json $buf }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
851 1159
852 if (ref $msg) { 1160 if (ref $msg) {
1161 my ($type, $reply, @payload) =
1162 "ARRAY" eq ref $msg
1163 ? @$msg
1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1165
1166 my @reply;
1167
853 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
854 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
855 $pl->ext_reply ($msg->{msgid}, %reply);
856 }
857 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
858 } else { 1175 } else {
859 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
860 } 1177 }
861 1178
862 cf::override; 1179 cf::override;
863 }, 1180 },
864); 1181);
865 1182
866sub load_extension {
867 my ($path) = @_;
868
869 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
870 my $base = $1;
871 my $pkg = $1;
872 $pkg =~ s/[^[:word:]]/_/g;
873 $pkg = "ext::$pkg";
874
875 warn "... loading '$path' into '$pkg'\n";
876
877 open my $fh, "<:utf8", $path
878 or die "$path: $!";
879
880 my $source =
881 "package $pkg; use strict; use utf8;\n"
882 . "#line 1 \"$path\"\n{\n"
883 . (do { local $/; <$fh> })
884 . "\n};\n1";
885
886 unless (eval $source) {
887 my $msg = $@ ? "$path: $@\n"
888 : "extension disabled.\n";
889 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
890 warn $@;
891 warn "mandatory extension failed to load, exiting.\n";
892 exit 1;
893 }
894 die $@;
895 }
896
897 push @EXTS, $pkg;
898}
899
900sub load_extensions { 1183sub load_extensions {
1184 cf::sync_job {
1185 my %todo;
1186
901 for my $ext (<$LIBDIR/*.ext>) { 1187 for my $path (<$LIBDIR/*.ext>) {
902 next unless -r $ext; 1188 next unless -r $path;
903 eval { 1189
904 load_extension $ext; 1190 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1191 my $base = $1;
1192 my $pkg = $1;
1193 $pkg =~ s/[^[:word:]]/_/g;
1194 $pkg = "ext::$pkg";
1195
1196 open my $fh, "<:utf8", $path
1197 or die "$path: $!";
1198
1199 my $source = do { local $/; <$fh> };
1200
1201 my %ext = (
1202 path => $path,
1203 base => $base,
1204 pkg => $pkg,
1205 );
1206
1207 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1208 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1209
1210 $ext{source} =
1211 "package $pkg; use strict; use utf8;\n"
1212 . "#line 1 \"$path\"\n{\n"
1213 . $source
1214 . "\n};\n1";
1215
1216 $todo{$base} = \%ext;
1217 }
1218
1219 my %done;
1220 while (%todo) {
1221 my $progress;
1222
1223 while (my ($k, $v) = each %todo) {
1224 for (split /,\s*/, $v->{meta}{depends}) {
1225 goto skip
1226 unless exists $done{$_};
1227 }
1228
1229 warn "... loading '$k' into '$v->{pkg}'\n";
1230
1231 unless (eval $v->{source}) {
1232 my $msg = $@ ? "$v->{path}: $@\n"
1233 : "$v->{base}: extension inactive.\n";
1234
1235 if (exists $v->{meta}{mandatory}) {
1236 warn $msg;
1237 warn "mandatory extension failed to load, exiting.\n";
1238 exit 1;
1239 }
1240
1241 warn $msg;
1242 }
1243
1244 $done{$k} = delete $todo{$k};
1245 push @EXTS, $v->{pkg};
1246 $progress = 1;
905 1 1247 }
906 } or warn "$ext not loaded: $@"; 1248
1249 skip:
1250 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1251 unless $progress;
1252 }
907 } 1253 };
908} 1254}
909 1255
910############################################################################# 1256#############################################################################
911 1257
1258=back
1259
912=head2 CORE EXTENSIONS 1260=head2 CORE EXTENSIONS
913 1261
914Functions and methods that extend core crossfire objects. 1262Functions and methods that extend core crossfire objects.
915 1263
916=cut 1264=cut
928Returns the given player object, loading it if necessary (might block). 1276Returns the given player object, loading it if necessary (might block).
929 1277
930=cut 1278=cut
931 1279
932sub playerdir($) { 1280sub playerdir($) {
933 cf::localdir 1281 "$PLAYERDIR/"
934 . "/"
935 . cf::playerdir
936 . "/"
937 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1282 . (ref $_[0] ? $_[0]->ob->name : $_[0])
938} 1283}
939 1284
940sub path($) { 1285sub path($) {
941 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1286 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
942 1287
943 (playerdir $login) . "/$login.pl" 1288 (playerdir $login) . "/playerdata"
944} 1289}
945 1290
946sub find_active($) { 1291sub find_active($) {
947 $cf::PLAYER{$_[0]} 1292 $cf::PLAYER{$_[0]}
948 and $cf::PLAYER{$_[0]}->active 1293 and $cf::PLAYER{$_[0]}->active
951 1296
952sub exists($) { 1297sub exists($) {
953 my ($login) = @_; 1298 my ($login) = @_;
954 1299
955 $cf::PLAYER{$login} 1300 $cf::PLAYER{$login}
956 or cf::sync_job { !aio_stat $login } 1301 or cf::sync_job { !aio_stat path $login }
957} 1302}
958 1303
959sub find($) { 1304sub find($) {
960 return $cf::PLAYER{$_[0]} || do { 1305 return $cf::PLAYER{$_[0]} || do {
961 my $login = $_[0]; 1306 my $login = $_[0];
962 1307
963 my $guard = cf::lock_acquire "user_find:$login"; 1308 my $guard = cf::lock_acquire "user_find:$login";
964 1309
965 $cf::PLAYER{$_[0]} || do { 1310 $cf::PLAYER{$_[0]} || do {
966 my $pl = load_pl path $login 1311 # rename old playerfiles to new ones
1312 #TODO: remove when no longer required
1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1316 aio_unlink +(playerdir $login) . "/$login.pl";
1317
1318 my $f = new_from_file cf::object::thawer path $login
967 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
968 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
969 } 1327 }
970 } 1328 }
971} 1329}
972 1330
982 1340
983 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
984 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
985 1343
986 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
987 Coro::cede; 1345 cf::cede_to_tick;
988} 1346}
989 1347
990sub new($) { 1348sub new($) {
991 my ($login) = @_; 1349 my ($login) = @_;
992 1350
998 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
999 1357
1000 $self 1358 $self
1001} 1359}
1002 1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1369}
1370
1003=item $pl->quit_character 1371=item $pl->quit_character
1004 1372
1005Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
1006be destroyed. May block for a long time. 1374be destroyed. May block for a long time.
1007 1375
1008=cut 1376=cut
1009 1377
1010sub quit_character { 1378sub quit_character {
1011 my ($pl) = @_; 1379 my ($pl) = @_;
1380
1381 my $name = $pl->ob->name;
1012 1382
1013 $pl->{deny_save} = 1; 1383 $pl->{deny_save} = 1;
1014 $pl->password ("*"); # this should lock out the player until we nuked the dir 1384 $pl->password ("*"); # this should lock out the player until we nuked the dir
1015 1385
1016 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1386 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1021 my $path = playerdir $pl; 1391 my $path = playerdir $pl;
1022 my $temp = "$path~$cf::RUNTIME~deleting~"; 1392 my $temp = "$path~$cf::RUNTIME~deleting~";
1023 aio_rename $path, $temp; 1393 aio_rename $path, $temp;
1024 delete $cf::PLAYER{$pl->ob->name}; 1394 delete $cf::PLAYER{$pl->ob->name};
1025 $pl->destroy; 1395 $pl->destroy;
1396
1397 my $prefix = qr<^~\Q$name\E/>;
1398
1399 # nuke player maps
1400 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1401
1026 IO::AIO::aio_rmtree $temp; 1402 IO::AIO::aio_rmtree $temp;
1403}
1404
1405=item $pl->kick
1406
1407Kicks a player out of the game. This destroys the connection.
1408
1409=cut
1410
1411sub kick {
1412 my ($pl, $kicker) = @_;
1413
1414 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1415 $pl->killer ("kicked");
1416 $pl->ns->destroy;
1027} 1417}
1028 1418
1029=item cf::player::list_logins 1419=item cf::player::list_logins
1030 1420
1031Returns am arrayref of all valid playernames in the system, can take a 1421Returns am arrayref of all valid playernames in the system, can take a
1032while and may block, so not sync_job-capable, ever. 1422while and may block, so not sync_job-capable, ever.
1033 1423
1034=cut 1424=cut
1035 1425
1036sub list_logins { 1426sub list_logins {
1037 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1427 my $dirs = aio_readdir $PLAYERDIR
1038 or return []; 1428 or return [];
1039 1429
1040 my @logins; 1430 my @logins;
1041 1431
1042 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1043 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1044 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1045 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1046 1441
1047 utf8::decode $login; 1442 utf8::decode $login;
1048 push @logins, $login; 1443 push @logins, $login;
1049 } 1444 }
1050 1445
1058 1453
1059=cut 1454=cut
1060 1455
1061sub maps($) { 1456sub maps($) {
1062 my ($pl) = @_; 1457 my ($pl) = @_;
1458
1459 $pl = ref $pl ? $pl->ob->name : $pl;
1063 1460
1064 my $files = aio_readdir playerdir $pl 1461 my $files = aio_readdir playerdir $pl
1065 or return; 1462 or return;
1066 1463
1067 my @paths; 1464 my @paths;
1069 for (@$files) { 1466 for (@$files) {
1070 utf8::decode $_; 1467 utf8::decode $_;
1071 next if /\.(?:pl|pst)$/; 1468 next if /\.(?:pl|pst)$/;
1072 next unless /^$PATH_SEP/o; 1469 next unless /^$PATH_SEP/o;
1073 1470
1074 s/\.map$//; 1471 push @paths, cf::map::normalise "~$pl/$_";
1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1076 } 1472 }
1077 1473
1078 \@paths 1474 \@paths
1079} 1475}
1080 1476
1477=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1478
1479Expand crossfire pod fragments into protocol xml.
1480
1481=cut
1482
1483sub expand_cfpod {
1484 ((my $self), (local $_)) = @_;
1485
1486 # escape & and <
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489
1490 # this is buggy, it needs to properly take care of nested <'s
1491
1492 1 while
1493 # replace B<>, I<>, U<> etc.
1494 s/B<([^\>]*)>/<b>$1<\/b>/
1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1081=item $player->ext_reply ($msgid, $msgtype, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1082 1529
1083Sends an ext reply to the player. 1530Sends an ext reply to the player.
1084 1531
1085=cut 1532=cut
1086 1533
1087sub ext_reply($$$%) { 1534sub ext_reply($$@) {
1088 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1089 1536
1090 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1091
1092 $self->send ("ext " . cf::to_json \%msg);
1093} 1538}
1094 1539
1095package cf; 1540=item $player->ext_msg ($type, @msg)
1541
1542Sends an ext event to the client.
1543
1544=cut
1545
1546sub ext_msg($$@) {
1547 my ($self, $type, @msg) = @_;
1548
1549 $self->ns->ext_msg ($type, @msg);
1550}
1551
1552=head3 cf::region
1553
1554=over 4
1555
1556=cut
1557
1558package cf::region;
1559
1560=item cf::region::find_by_path $path
1561
1562Tries to decuce the likely region for a map knowing only its path.
1563
1564=cut
1565
1566sub find_by_path($) {
1567 my ($path) = @_;
1568
1569 my ($match, $specificity);
1570
1571 for my $region (list) {
1572 if ($region->{match} && $path =~ $region->{match}) {
1573 ($match, $specificity) = ($region, $region->specificity)
1574 if $region->specificity > $specificity;
1575 }
1576 }
1577
1578 $match
1579}
1096 1580
1097=back 1581=back
1098
1099 1582
1100=head3 cf::map 1583=head3 cf::map
1101 1584
1102=over 4 1585=over 4
1103 1586
1107 1590
1108use Fcntl; 1591use Fcntl;
1109use Coro::AIO; 1592use Coro::AIO;
1110 1593
1111use overload 1594use overload
1112 '""' => \&as_string; 1595 '""' => \&as_string,
1596 fallback => 1;
1113 1597
1114our $MAX_RESET = 3600; 1598our $MAX_RESET = 3600;
1115our $DEFAULT_RESET = 3000; 1599our $DEFAULT_RESET = 3000;
1116 1600
1117sub generate_random_map { 1601sub generate_random_map {
1118 my ($self, $rmp) = @_; 1602 my ($self, $rmp) = @_;
1119
1120 # mit "rum" bekleckern, nicht 1603 # mit "rum" bekleckern, nicht
1121 $self->_create_random_map ( 1604 $self->_create_random_map (
1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1605 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1606 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1607 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1614 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1132 (cf::region::find $rmp->{region}), $rmp->{custom} 1615 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 ) 1616 )
1134} 1617}
1135 1618
1619=item cf::map->register ($regex, $prio)
1620
1621Register a handler for the map path matching the given regex at the
1622givne priority (higher is better, built-in handlers have priority 0, the
1623default).
1624
1625=cut
1626
1136sub register { 1627sub register {
1137 my (undef, $regex) = @_; 1628 my (undef, $regex, $prio) = @_;
1138 my $pkg = caller; 1629 my $pkg = caller;
1139 1630
1140 no strict; 1631 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__; 1632 push @{"$pkg\::ISA"}, __PACKAGE__;
1142 1633
1143 $EXT_MAP{$pkg} = qr<$regex>; 1634 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1144} 1635}
1145 1636
1146# also paths starting with '/' 1637# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1638$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1639
1640sub thawer_merge {
1641 my ($self, $merge) = @_;
1642
1643 # we have to keep some variables in memory intact
1644 local $self->{path};
1645 local $self->{load_path};
1646
1647 $self->SUPER::thawer_merge ($merge);
1648}
1148 1649
1149sub normalise { 1650sub normalise {
1150 my ($path, $base) = @_; 1651 my ($path, $base) = @_;
1652
1653 $path = "$path"; # make sure its a string
1654
1655 $path =~ s/\.map$//;
1151 1656
1152 # map plan: 1657 # map plan:
1153 # 1658 #
1154 # /! non-realised random map exit (special hack!) 1659 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched 1660 # {... are special paths that are not being touched
1183 1688
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1689 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185 1690
1186 $path = normalise $path, $base; 1691 $path = normalise $path, $base;
1187 1692
1188 for my $pkg (keys %EXT_MAP) { 1693 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) { 1694 if ($path =~ $EXT_MAP{$pkg}[1]) {
1190 my $self = bless cf::map::new, $pkg; 1695 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path); 1696 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1193 return $self; 1698 return $self;
1194 } 1699 }
1195 } 1700 }
1196 1701
1197 Carp::carp "unable to resolve path '$path'."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1198 () 1703 ()
1199} 1704}
1200 1705
1201sub init { 1706sub init {
1202 my ($self) = @_; 1707 my ($self) = @_;
1217 1722
1218# the original (read-only) location 1723# the original (read-only) location
1219sub load_path { 1724sub load_path {
1220 my ($self) = @_; 1725 my ($self) = @_;
1221 1726
1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1727 "$MAPDIR/$self->{path}.map"
1223} 1728}
1224 1729
1225# the temporary/swap location 1730# the temporary/swap location
1226sub save_path { 1731sub save_path {
1227 my ($self) = @_; 1732 my ($self) = @_;
1228 1733
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1734 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1735 "$TMPDIR/$path.map"
1231} 1736}
1232 1737
1233# the unique path, undef == no special unique path 1738# the unique path, undef == no special unique path
1234sub uniq_path { 1739sub uniq_path {
1235 my ($self) = @_; 1740 my ($self) = @_;
1236 1741
1237 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1238 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1743 "$UNIQUEDIR/$path"
1239} 1744}
1240 1745
1241# and all this just because we cannot iterate over 1746# and all this just because we cannot iterate over
1242# all maps in C++... 1747# all maps in C++...
1243sub change_all_map_light { 1748sub change_all_map_light {
1245 1750
1246 $_->change_map_light ($change) 1751 $_->change_map_light ($change)
1247 for grep $_->outdoor, values %cf::MAP; 1752 for grep $_->outdoor, values %cf::MAP;
1248} 1753}
1249 1754
1755sub decay_objects {
1756 my ($self) = @_;
1757
1758 return if $self->{deny_reset};
1759
1760 $self->do_decay_objects;
1761}
1762
1250sub unlink_save { 1763sub unlink_save {
1251 my ($self) = @_; 1764 my ($self) = @_;
1252 1765
1253 utf8::encode (my $save = $self->save_path); 1766 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1767 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1768 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1256} 1769}
1257 1770
1258sub load_header_from($) { 1771sub load_header_from($) {
1259 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1260 1773
1261 utf8::encode $path; 1774 utf8::encode $path;
1262 aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1263 or return; 1776 or return;
1264 1777
1265 $self->_load_header ($path) 1778 $self->_load_header ($f)
1266 or return; 1779 or return;
1267 1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1783
1268 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1269 1785
1270 1 1786 1
1271} 1787}
1272 1788
1273sub load_orig { 1789sub load_header_orig {
1274 my ($self) = @_; 1790 my ($self) = @_;
1275 1791
1276 $self->load_header_from ($self->load_path) 1792 $self->load_header_from ($self->load_path)
1277} 1793}
1278 1794
1279sub load_temp { 1795sub load_header_temp {
1280 my ($self) = @_; 1796 my ($self) = @_;
1281 1797
1282 $self->load_header_from ($self->save_path) 1798 $self->load_header_from ($self->save_path)
1799}
1800
1801sub prepare_temp {
1802 my ($self) = @_;
1803
1804 $self->last_access ((delete $self->{last_access})
1805 || $cf::RUNTIME); #d#
1806 # safety
1807 $self->{instantiate_time} = $cf::RUNTIME
1808 if $self->{instantiate_time} > $cf::RUNTIME;
1809}
1810
1811sub prepare_orig {
1812 my ($self) = @_;
1813
1814 $self->{load_original} = 1;
1815 $self->{instantiate_time} = $cf::RUNTIME;
1816 $self->last_access ($cf::RUNTIME);
1817 $self->instantiate;
1283} 1818}
1284 1819
1285sub load_header { 1820sub load_header {
1286 my ($self) = @_; 1821 my ($self) = @_;
1287 1822
1288 if ($self->load_temp) { 1823 if ($self->load_header_temp) {
1289 $self->last_access ((delete $self->{last_access}) 1824 $self->prepare_temp;
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else { 1825 } else {
1295 $self->load_orig 1826 $self->load_header_orig
1296 or return; 1827 or return;
1297 1828 $self->prepare_orig;
1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 } 1829 }
1830
1831 $self->{deny_reset} = 1
1832 if $self->no_reset;
1833
1834 $self->default_region (cf::region::find_by_path $self->{path})
1835 unless $self->default_region;
1303 1836
1304 1 1837 1
1305} 1838}
1306 1839
1307sub find; 1840sub find;
1320 $map->{last_save} = $cf::RUNTIME; 1853 $map->{last_save} = $cf::RUNTIME;
1321 1854
1322 $map->load_header 1855 $map->load_header
1323 or return; 1856 or return;
1324 1857
1325 if ($map->should_reset) { 1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait;
1326 $map->reset; 1861 $map->reset;
1327 undef $guard; 1862 undef $guard;
1328 $map = find $path 1863 return find $path;
1329 or return;
1330 } 1864 }
1331 1865
1332 $cf::MAP{$path} = $map 1866 $cf::MAP{$path} = $map
1333 } 1867 }
1334} 1868}
1869
1870sub pre_load { }
1871sub post_load { }
1335 1872
1336sub load { 1873sub load {
1337 my ($self) = @_; 1874 my ($self) = @_;
1338 1875
1876 local $self->{deny_reset} = 1; # loading can take a long time
1877
1339 my $path = $self->{path}; 1878 my $path = $self->{path};
1879
1880 {
1340 my $guard = cf::lock_acquire "map_load:$path"; 1881 my $guard = cf::lock_acquire "map_data:$path";
1341 1882
1883 return unless $self->valid;
1342 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1343 1885
1344 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1345 1887
1346 $self->alloc; 1888 $self->alloc;
1347 $self->_load_objects ($self->{load_path}, 1) 1889
1890 $self->pre_load;
1891 cf::cede_to_tick;
1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1895 $self->_load_objects ($f)
1348 or return; 1896 or return;
1349 1897
1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1351 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1352 1900
1353 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1354 utf8::encode $uniq; 1902 utf8::encode $uniq;
1355 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1356 $self->clear_unique_items; 1905 $self->clear_unique_items;
1357 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1358 } 1909 }
1359 } 1910 }
1360 1911
1361 Coro::cede; 1912 $f->resolve_delayed_derefs;
1362 1913
1914 cf::cede_to_tick;
1363 # now do the right thing for maps 1915 # now do the right thing for maps
1364 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1365
1366 unless ($self->{deny_activate}) {
1367 $self->decay_objects;
1368 $self->fix_auto_apply;
1369 $self->update_buttons;
1370 Coro::cede;
1371 $self->set_darkness_map;
1372 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1373 unless $self->difficulty; 1918 unless $self->difficulty;
1374 Coro::cede; 1919 cf::cede_to_tick;
1920
1921 unless ($self->{deny_activate}) {
1922 $self->decay_objects;
1923 $self->fix_auto_apply;
1924 $self->update_buttons;
1925 cf::cede_to_tick;
1926 $self->set_darkness_map;
1927 cf::cede_to_tick;
1375 $self->activate; 1928 $self->activate;
1376 } 1929 }
1377 1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1933
1378 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1935 }
1936
1937 $self->post_load;
1379} 1938}
1380 1939
1381sub customise_for { 1940sub customise_for {
1382 my ($self, $ob) = @_; 1941 my ($self, $ob) = @_;
1383 1942
1384 return find "~" . $ob->name . "/" . $self->{path} 1943 return find "~" . $ob->name . "/" . $self->{path}
1385 if $self->per_player; 1944 if $self->per_player;
1386 1945
1946# return find "?party/" . $ob->name . "/" . $self->{path}
1947# if $self->per_party;
1948
1387 $self 1949 $self
1388} 1950}
1389 1951
1390# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1391sub load_diag { 1953sub load_neighbours {
1392 my ($map) = @_; 1954 my ($map) = @_;
1393 1955
1394 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1395 1957
1396 for (0 .. 3) { 1958 for (0 .. 3) {
1397 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1398 or next; 1960 or next;
1399 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1400 or next; 1962 or next;
1401 $neigh->load; 1963 $neigh->load;
1402 1964
1965 push @neigh,
1403 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1404 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1405 } 1968 }
1406 1969
1407 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1408 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1409 or next; 1973 or next;
1410 $neigh->load; 1974 $neigh->load;
1411 } 1975 }
1412} 1976}
1413 1977
1418} 1982}
1419 1983
1420sub do_load_sync { 1984sub do_load_sync {
1421 my ($map) = @_; 1985 my ($map) = @_;
1422 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1423 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1424} 1991}
1425 1992
1426our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async { 1994our $MAP_PREFETCHER = undef;
1428 while () {
1429 for my $path (keys %MAP_PREFETCH) {
1430 my $map = find $path
1431 or next;
1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1435 }
1436 Coro::schedule;
1437 }
1438};
1439 1995
1440sub find_async { 1996sub find_async {
1441 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1442 1998
1443 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1444 2000
1445 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 }
2004
2005 $MAP_PREFETCH{$path} |= $load;
2006
2007 $MAP_PREFETCHER ||= cf::async {
2008 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) {
2011 $map->load if $v;
2012 }
2013
2014 delete $MAP_PREFETCH{$k};
2015 }
2016 }
2017 undef $MAP_PREFETCHER;
1447 } 2018 };
1448
1449 $MAP_PREFETCH{$path} = 0;
1450 $MAP_PREFETCHER->ready; 2019 $MAP_PREFETCHER->prio (6);
1451 2020
1452 () 2021 ()
1453} 2022}
1454 2023
1455sub save { 2024sub save {
1456 my ($self) = @_; 2025 my ($self) = @_;
1457 2026
1458 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1459 2028
1460 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1461 2030
1462 return unless $self->dirty; 2031 return unless $self->dirty;
1463 2032
1486 my ($self) = @_; 2055 my ($self) = @_;
1487 2056
1488 # save first because save cedes 2057 # save first because save cedes
1489 $self->save; 2058 $self->save;
1490 2059
1491 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1492 2061
1493 return if $self->players; 2062 return if $self->players;
1494 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1495 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1496 2065
1500 2069
1501sub reset_at { 2070sub reset_at {
1502 my ($self) = @_; 2071 my ($self) = @_;
1503 2072
1504 # TODO: safety, remove and allow resettable per-player maps 2073 # TODO: safety, remove and allow resettable per-player maps
1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1506 return 1e99 if $self->{deny_reset}; 2074 return 1e99 if $self->{deny_reset};
1507 2075
1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2076 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1509 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2077 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1510 2078
1515 my ($self) = @_; 2083 my ($self) = @_;
1516 2084
1517 $self->reset_at <= $cf::RUNTIME 2085 $self->reset_at <= $cf::RUNTIME
1518} 2086}
1519 2087
1520sub rename {
1521 my ($self, $new_path) = @_;
1522
1523 normalise $new_path;
1524
1525 $self->unlink_save;
1526
1527 delete $cf::MAP{$self->path};
1528 $self->{path} = $new_path; $self->path ($self->{path});
1529 $cf::MAP{$self->path} = $self;
1530
1531 $self->save;
1532}
1533
1534sub reset { 2088sub reset {
1535 my ($self) = @_; 2089 my ($self) = @_;
1536 2090
1537 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2091 my $lock = cf::lock_acquire "map_data:$self->{path}";
1538 2092
1539 return if $self->players; 2093 return if $self->players;
1540 return if $self->isa ("ext::map_per_player");#d#
1541 2094
1542 warn "resetting map ", $self->path;#d# 2095 warn "resetting map ", $self->path;
2096
2097 $self->in_memory (cf::MAP_SWAPPED);
2098
2099 # need to save uniques path
2100 unless ($self->{deny_save}) {
2101 my $uniq = $self->uniq_path; utf8::encode $uniq;
2102
2103 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2104 if $uniq;
2105 }
1543 2106
1544 delete $cf::MAP{$self->path}; 2107 delete $cf::MAP{$self->path};
1545 2108
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear; 2109 $self->clear;
1548 2110
1549 $_->clear_links_to ($self) for values %cf::MAP; 2111 $_->clear_links_to ($self) for values %cf::MAP;
1550 2112
1551 $self->unlink_save; 2113 $self->unlink_save;
1555my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
1556 2118
1557sub nuke { 2119sub nuke {
1558 my ($self) = @_; 2120 my ($self) = @_;
1559 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
2125 delete $cf::MAP{$self->path};
2126
2127 $self->unlink_save;
2128
2129 bless $self, "cf::map";
2130 delete $self->{deny_reset};
1560 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
1561 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
1562 $self->rename ("{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2134
2135 $cf::MAP{$self->path} = $self;
2136 }
2137
1563 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2139}
2140
2141=item $maps = cf::map::tmp_maps
2142
2143Returns an arrayref with all map paths of currently instantiated and saved
2144maps. May block.
2145
2146=cut
2147
2148sub tmp_maps() {
2149 [
2150 map {
2151 utf8::decode $_;
2152 /\.map$/
2153 ? normalise $_
2154 : ()
2155 } @{ aio_readdir $TMPDIR or [] }
2156 ]
2157}
2158
2159=item $maps = cf::map::random_maps
2160
2161Returns an arrayref with all map paths of currently instantiated and saved
2162random maps. May block.
2163
2164=cut
2165
2166sub random_maps() {
2167 [
2168 map {
2169 utf8::decode $_;
2170 /\.map$/
2171 ? normalise "?random/$_"
2172 : ()
2173 } @{ aio_readdir $RANDOMDIR or [] }
2174 ]
1564} 2175}
1565 2176
1566=item cf::map::unique_maps 2177=item cf::map::unique_maps
1567 2178
1568Returns an arrayref of paths of all shared maps that have 2179Returns an arrayref of paths of all shared maps that have
1569instantiated unique items. May block. 2180instantiated unique items. May block.
1570 2181
1571=cut 2182=cut
1572 2183
1573sub unique_maps() { 2184sub unique_maps() {
1574 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2185 [
1575 or return; 2186 map {
1576
1577 my @paths;
1578
1579 for (@$files) {
1580 utf8::decode $_; 2187 utf8::decode $_;
1581 next if /\.pst$/;
1582 next unless /^$PATH_SEP/o;
1583
1584 s/\.map$//; 2188 /\.map$/
1585 push @paths, $_; 2189 ? normalise $_
2190 : ()
2191 } @{ aio_readdir $UNIQUEDIR or [] }
1586 } 2192 ]
1587
1588 \@paths
1589} 2193}
1590 2194
1591package cf; 2195package cf;
1592 2196
1593=back 2197=back
1611 map { $_, inv_recursive_ $_->inv } @_ 2215 map { $_, inv_recursive_ $_->inv } @_
1612} 2216}
1613 2217
1614sub inv_recursive { 2218sub inv_recursive {
1615 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2220}
2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
1616} 2251}
1617 2252
1618package cf; 2253package cf;
1619 2254
1620=back 2255=back
1639 2274
1640 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2275 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1641 2276
1642 if ($self->{record_replies}) { 2277 if ($self->{record_replies}) {
1643 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2278 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2279
1644 } else { 2280 } else {
2281 my $pl = $self->contr;
2282
2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2284 my $dialog = $pl->{npc_dialog};
2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2286
2287 } else {
1645 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
1646 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2290 }
1647 } 2291 }
2292}
2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
1648} 2302}
1649 2303
1650=item $player_object->may ("access") 2304=item $player_object->may ("access")
1651 2305
1652Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
1684=cut 2338=cut
1685 2339
1686sub link_map { 2340sub link_map {
1687 unless ($LINK_MAP) { 2341 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}" 2342 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2343 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1690 $LINK_MAP->load; 2344 $LINK_MAP->load;
1691 } 2345 }
1692 2346
1693 $LINK_MAP 2347 $LINK_MAP
1694} 2348}
1699 $self->deactivate_recursive; 2353 $self->deactivate_recursive;
1700 2354
1701 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2355 return if UNIVERSAL::isa $self->map, "ext::map_link";
1702 2356
1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2357 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1704 if $self->map; 2358 if $self->map && $self->map->{path} ne "{link}";
1705 2359
1706 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2360 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1707} 2361}
1708 2362
1709sub cf::object::player::leave_link { 2363sub cf::object::player::leave_link {
1710 my ($self, $map, $x, $y) = @_; 2364 my ($self, $map, $x, $y) = @_;
2365
2366 return unless $self->contr->active;
1711 2367
1712 my $link_pos = delete $self->{_link_pos}; 2368 my $link_pos = delete $self->{_link_pos};
1713 2369
1714 unless ($map) { 2370 unless ($map) {
1715 # restore original map position 2371 # restore original map position
1729 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
1730 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
1731 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
1732 2388
1733 $map->load; 2389 $map->load;
1734 $map->load_diag; 2390 $map->load_neighbours;
1735 2391
1736 return unless $self->contr->active; 2392 return unless $self->contr->active;
1737 $self->activate_recursive; 2393 $self->activate_recursive;
2394
2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1738 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
1739} 2397}
1740 2398
1741cf::player->attach ( 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1742 on_logout => sub {
1743 my ($pl) = @_;
1744 2400
1745 # abort map switching before logout 2401Moves the player to the given map-path and coordinates by first freezing
1746 if ($pl->ob->{_link_pos}) { 2402her, loading and preparing them map, calling the provided $check callback
1747 cf::sync_job { 2403that has to return the map if sucecssful, and then unfreezes the player on
1748 $pl->ob->leave_link 2404the new (success) or old (failed) map position. In either case, $done will
1749 }; 2405be called at the end of this process.
1750 }
1751 },
1752 on_login => sub {
1753 my ($pl) = @_;
1754 2406
1755 # try to abort aborted map switching on player login :)
1756 # should happen only on crashes
1757 if ($pl->ob->{_link_pos}) {
1758 $pl->ob->enter_link;
1759 (async {
1760 # we need this sleep as the login has a concurrent enter_exit running
1761 # and this sleep increases chances of the player not ending up in scorn
1762 $pl->ob->reply (undef,
1763 "There was an internal problem at your last logout, "
1764 . "the server will try to bring you to your intended destination in a second.",
1765 cf::NDI_RED);
1766 Coro::Timer::sleep 1;
1767 $pl->ob->leave_link;
1768 })->prio (2);
1769 }
1770 },
1771);
1772
1773=item $player_object->goto ($path, $x, $y)
1774
1775=cut 2407=cut
2408
2409our $GOTOGEN;
1776 2410
1777sub cf::object::player::goto { 2411sub cf::object::player::goto {
1778 my ($self, $path, $x, $y) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2413
2414 # do generation counting so two concurrent goto's will be executed in-order
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1779 2416
1780 $self->enter_link; 2417 $self->enter_link;
1781 2418
1782 (async { 2419 (async {
2420 my $map = eval {
1783 my $map = cf::map::find $path; 2421 my $map = cf::map::find $path;
2422
2423 if ($map) {
1784 $map = $map->customise_for ($self) if $map; 2424 $map = $map->customise_for ($self);
1785 2425 $map = $check->($map) if $check && $map;
1786# warn "entering ", $map->path, " at ($x, $y)\n" 2426 } else {
1787# if $map;
1788
1789 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2428 }
1790 2429
2430 $map
2431 };
2432
2433 if ($@) {
2434 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2435 LOG llevError | logBacktrace, Carp::longmess $@;
2436 }
2437
2438 if ($gen == $self->{_goto_generation}) {
2439 delete $self->{_goto_generation};
1791 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2441 }
2442
2443 $done->() if $done;
1792 })->prio (1); 2444 })->prio (1);
1793} 2445}
1794 2446
1795=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
1796 2448
1798 2450
1799sub parse_random_map_params { 2451sub parse_random_map_params {
1800 my ($spec) = @_; 2452 my ($spec) = @_;
1801 2453
1802 my $rmp = { # defaults 2454 my $rmp = { # defaults
1803 xsize => 10, 2455 xsize => (cf::rndm 15, 40),
1804 ysize => 10, 2456 ysize => (cf::rndm 15, 40),
2457 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2458 #layout => string,
1805 }; 2459 };
1806 2460
1807 for (split /\n/, $spec) { 2461 for (split /\n/, $spec) {
1808 my ($k, $v) = split /\s+/, $_, 2; 2462 my ($k, $v) = split /\s+/, $_, 2;
1809 2463
1813 $rmp 2467 $rmp
1814} 2468}
1815 2469
1816sub prepare_random_map { 2470sub prepare_random_map {
1817 my ($exit) = @_; 2471 my ($exit) = @_;
2472
2473 my $guard = cf::lock_acquire "exit_prepare:$exit";
1818 2474
1819 # all this does is basically replace the /! path by 2475 # all this does is basically replace the /! path by
1820 # a new random map path (?random/...) with a seed 2476 # a new random map path (?random/...) with a seed
1821 # that depends on the exit object 2477 # that depends on the exit object
1822 2478
1823 my $rmp = parse_random_map_params $exit->msg; 2479 my $rmp = parse_random_map_params $exit->msg;
1824 2480
1825 if ($exit->map) { 2481 if ($exit->map) {
1826 $rmp->{region} = $exit->map->region_name; 2482 $rmp->{region} = $exit->region->name;
1827 $rmp->{origin_map} = $exit->map->path; 2483 $rmp->{origin_map} = $exit->map->path;
1828 $rmp->{origin_x} = $exit->x; 2484 $rmp->{origin_x} = $exit->x;
1829 $rmp->{origin_y} = $exit->y; 2485 $rmp->{origin_y} = $exit->y;
1830 } 2486 }
1831 2487
1832 $rmp->{random_seed} ||= $exit->random_seed; 2488 $rmp->{random_seed} ||= $exit->random_seed;
1833 2489
1834 my $data = cf::to_json $rmp; 2490 my $data = cf::to_json $rmp;
1835 my $md5 = Digest::MD5::md5_hex $data; 2491 my $md5 = Digest::MD5::md5_hex $data;
2492 my $meta = "$RANDOMDIR/$md5.meta";
1836 2493
1837 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1838 aio_write $fh, 0, (length $data), $data, 0; 2495 aio_write $fh, 0, (length $data), $data, 0;
2496 undef $fh;
2497 aio_rename "$meta~", $meta;
1839 2498
1840 $exit->slaying ("?random/$md5"); 2499 $exit->slaying ("?random/$md5");
1841 $exit->msg (undef); 2500 $exit->msg (undef);
1842 } 2501 }
1843} 2502}
1845sub cf::object::player::enter_exit { 2504sub cf::object::player::enter_exit {
1846 my ($self, $exit) = @_; 2505 my ($self, $exit) = @_;
1847 2506
1848 return unless $self->type == cf::PLAYER; 2507 return unless $self->type == cf::PLAYER;
1849 2508
2509 if ($exit->slaying eq "/!") {
2510 #TODO: this should de-fi-ni-te-ly not be a sync-job
2511 # the problem is that $exit might not survive long enough
2512 # so it needs to be done right now, right here
2513 cf::sync_job { prepare_random_map $exit };
2514 }
2515
2516 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2517 my $hp = $exit->stats->hp;
2518 my $sp = $exit->stats->sp;
2519
1850 $self->enter_link; 2520 $self->enter_link;
2521
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
1851 2525
1852 (async { 2526 (async {
1853 $self->deactivate_recursive; # just to be sure 2527 $self->deactivate_recursive; # just to be sure
1854 unless (eval { 2528 unless (eval {
1855 prepare_random_map $exit 2529 $self->goto ($slaying, $hp, $sp);
1856 if $exit->slaying eq "/!";
1857
1858 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1860 2530
1861 1; 2531 1;
1862 }) { 2532 }) {
1863 $self->message ("Something went wrong deep within the crossfire server. " 2533 $self->message ("Something went wrong deep within the crossfire server. "
1864 . "I'll try to bring you back to the map you were before. " 2534 . "I'll try to bring you back to the map you were before. "
1865 . "Please report this to the dungeon master!", 2535 . "Please report this to the dungeon master!",
1866 cf::NDI_UNIQUE | cf::NDI_RED); 2536 cf::NDI_UNIQUE | cf::NDI_RED);
1867 2537
1868 warn "ERROR in enter_exit: $@"; 2538 warn "ERROR in enter_exit: $@";
1869 $self->leave_link; 2539 $self->leave_link;
1870 } 2540 }
1871 })->prio (1); 2541 })->prio (1);
1884 2554
1885sub cf::client::send_drawinfo { 2555sub cf::client::send_drawinfo {
1886 my ($self, $text, $flags) = @_; 2556 my ($self, $text, $flags) = @_;
1887 2557
1888 utf8::encode $text; 2558 utf8::encode $text;
1889 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2559 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1890} 2560}
1891 2561
2562=item $client->send_msg ($channel, $msg, $color, [extra...])
2563
2564Send a drawinfo or msg packet to the client, formatting the msg for the
2565client if neccessary. C<$type> should be a string identifying the type of
2566the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet.
2568
2569=cut
2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2586sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_;
2588
2589 $msg = $self->pl->expand_cfpod ($msg);
2590
2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2595
2596 if (ref $channel) {
2597 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2602 }
2603
2604 $channel = $channel->{id};
2605 }
2606
2607 return unless @extra || length $msg;
2608
2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2616 } else {
2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2635 } else {
2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2637 $self->send_packet ("drawinfo $color $msg")
2638 }
2639 }
2640 }
2641}
2642
2643=item $client->ext_msg ($type, @msg)
2644
2645Sends an ext event to the client.
2646
2647=cut
2648
2649sub cf::client::ext_msg($$@) {
2650 my ($self, $type, @msg) = @_;
2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2655 push @msg, msgtype => "event_$type";
2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 }
2676}
1892 2677
1893=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
1894 2679
1895Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
1896the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2681the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1897C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2682C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1898 2683
1899Queries can fail, so check the return code. Or don't, as queries will become 2684Queries can fail, so check the return code. Or don't, as queries will
1900reliable at some point in the future. 2685become reliable at some point in the future.
1901 2686
1902=cut 2687=cut
1903 2688
1904sub cf::client::query { 2689sub cf::client::query {
1905 my ($self, $flags, $text, $cb) = @_; 2690 my ($self, $flags, $text, $cb) = @_;
1913 utf8::encode $text; 2698 utf8::encode $text;
1914 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2699 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1915 2700
1916 $self->send_packet ($self->{query_queue}[0][0]) 2701 $self->send_packet ($self->{query_queue}[0][0])
1917 if @{ $self->{query_queue} } == 1; 2702 if @{ $self->{query_queue} } == 1;
2703
2704 1
1918} 2705}
1919 2706
1920cf::client->attach ( 2707cf::client->attach (
2708 on_connect => sub {
2709 my ($ns) = @_;
2710
2711 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2712 },
1921 on_reply => sub { 2713 on_reply => sub {
1922 my ($ns, $msg) = @_; 2714 my ($ns, $msg) = @_;
1923 2715
1924 # this weird shuffling is so that direct followup queries 2716 # this weird shuffling is so that direct followup queries
1925 # get handled first 2717 # get handled first
1926 my $queue = delete $ns->{query_queue} 2718 my $queue = delete $ns->{query_queue}
1927 or return; # be conservative, not sure how that can happen, but we saw a crash here 2719 or return; # be conservative, not sure how that can happen, but we saw a crash here
1928 2720
1929 (shift @$queue)->[1]->($msg); 2721 (shift @$queue)->[1]->($msg);
2722 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1930 2723
1931 push @{ $ns->{query_queue} }, @$queue; 2724 push @{ $ns->{query_queue} }, @$queue;
1932 2725
1933 if (@{ $ns->{query_queue} } == @$queue) { 2726 if (@{ $ns->{query_queue} } == @$queue) {
1934 if (@$queue) { 2727 if (@$queue) {
1936 } else { 2729 } else {
1937 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2730 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1938 } 2731 }
1939 } 2732 }
1940 }, 2733 },
2734 on_exticmd => sub {
2735 my ($ns, $buf) = @_;
2736
2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2738
2739 if (ref $msg) {
2740 my ($type, $reply, @payload) =
2741 "ARRAY" eq ref $msg
2742 ? @$msg
2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2744
2745 my @reply;
2746
2747 if (my $cb = $EXTICMD{$type}) {
2748 @reply = $cb->($ns, @payload);
2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2754 } else {
2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2756 }
2757
2758 cf::override;
2759 },
1941); 2760);
1942 2761
1943=item $client->async (\&cb) 2762=item $client->async (\&cb)
1944 2763
1945Create a new coroutine, running the specified callback. The coroutine will 2764Create a new coroutine, running the specified callback. The coroutine will
1986our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
1987our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
1988 2807
1989$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
1990 2809
1991$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
1992 2815
1993# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
1994 2817
1995=pod 2818=pod
1996 2819
1997The following fucntions and emthods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
1998 2821
1999 cf::object contr pay_amount pay_player map 2822 cf::object
2823 contr pay_amount pay_player map x y force_find force_add
2824 insert remove name archname title slaying race decrease_ob_nr
2825
2000 cf::object::player player 2826 cf::object::player
2001 cf::player peaceful 2827 player
2002 cf::map trigger 2828
2829 cf::player
2830 peaceful
2831
2832 cf::map
2833 trigger
2003 2834
2004=cut 2835=cut
2005 2836
2006for ( 2837for (
2007 ["cf::object" => qw(contr pay_amount pay_player map)], 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race
2840 decrease_ob_nr)],
2008 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2009 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2010 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2011) { 2844) {
2012 no strict 'refs'; 2845 no strict 'refs';
2083=back 2916=back
2084 2917
2085=cut 2918=cut
2086 2919
2087############################################################################# 2920#############################################################################
2921# the server's init and main functions
2088 2922
2089=head2 EXTENSION DATABASE SUPPORT 2923sub load_facedata($) {
2924 my ($path) = @_;
2090 2925
2091Crossfire maintains a very simple database for extension use. It can 2926 # HACK to clear player env face cache, we need some signal framework
2092currently store anything that can be serialised using Storable, which 2927 # for this (global event?)
2093excludes objects. 2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2094 2929
2095The parameter C<$family> should best start with the name of the extension 2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2096using it, it should be unique.
2097 2931
2098=over 4 2932 warn "loading facedata from $path\n";
2099 2933
2100=item $hashref = cf::db_get $family 2934 my $facedata;
2935 0 < aio_load $path, $facedata
2936 or die "$path: $!";
2101 2937
2102Return a hashref for use by the extension C<$family>, which can be 2938 $facedata = Coro::Storable::thaw $facedata;
2103modified. After modifications, you have to call C<cf::db_dirty> or
2104C<cf::db_sync>.
2105 2939
2106=item $value = cf::db_get $family => $key 2940 $facedata->{version} == 2
2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2107 2942
2108Returns a single value from the database 2943 # patch in the exptable
2109 2944 $facedata->{resource}{"res/exp_table"} = {
2110=item cf::db_put $family => $hashref 2945 type => FT_RSRC,
2111 2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2112Stores the given family hashref into the database. Updates are delayed, if
2113you want the data to be synced to disk immediately, use C<cf::db_sync>.
2114
2115=item cf::db_put $family => $key => $value
2116
2117Stores the given C<$value> in the family hash. Updates are delayed, if you
2118want the data to be synced to disk immediately, use C<cf::db_sync>.
2119
2120=item cf::db_dirty
2121
2122Marks the database as dirty, to be updated at a later time.
2123
2124=item cf::db_sync
2125
2126Immediately write the database to disk I<if it is dirty>.
2127
2128=cut
2129
2130our $DB;
2131
2132{
2133 my $path = cf::localdir . "/database.pst";
2134
2135 sub db_load() {
2136 $DB = stat $path ? Storable::retrieve $path : { };
2137 }
2138
2139 my $pid;
2140
2141 sub db_save() {
2142 waitpid $pid, 0 if $pid;
2143 if (0 == ($pid = fork)) {
2144 $DB->{_meta}{version} = 1;
2145 Storable::nstore $DB, "$path~";
2146 rename "$path~", $path;
2147 cf::_exit 0 if defined $pid;
2148 }
2149 }
2150
2151 my $dirty;
2152
2153 sub db_sync() {
2154 db_save if $dirty;
2155 undef $dirty;
2156 }
2157
2158 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2159 db_sync;
2160 }); 2947 };
2948 cf::cede_to_tick;
2161 2949
2162 sub db_dirty() {
2163 $dirty = 1;
2164 $idle->start;
2165 } 2950 {
2951 my $faces = $facedata->{faceinfo};
2166 2952
2167 sub db_get($;$) { 2953 while (my ($face, $info) = each %$faces) {
2168 @_ >= 2 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2169 ? $DB->{$_[0]}{$_[1]} 2955 cf::face::set_visibility $idx, $info->{visibility};
2170 : ($DB->{$_[0]} ||= { }) 2956 cf::face::set_magicmap $idx, $info->{magicmap};
2171 } 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2172 2959
2173 sub db_put($$;$) { 2960 cf::cede_to_tick;
2174 if (@_ >= 3) {
2175 $DB->{$_[0]}{$_[1]} = $_[2];
2176 } else {
2177 $DB->{$_[0]} = $_[1];
2178 }
2179 db_dirty;
2180 }
2181
2182 cf::global->attach (
2183 prio => 10000,
2184 on_cleanup => sub {
2185 db_sync;
2186 }, 2961 }
2187 );
2188}
2189 2962
2190############################################################################# 2963 while (my ($face, $info) = each %$faces) {
2191# the server's main() 2964 next unless $info->{smooth};
2965 my $idx = cf::face::find $face
2966 or next;
2967 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth;
2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2970 } else {
2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2972 }
2192 2973
2193sub cfg_load { 2974 cf::cede_to_tick;
2975 }
2976 }
2977
2978 {
2979 my $anims = $facedata->{animinfo};
2980
2981 while (my ($anim, $info) = each %$anims) {
2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2983 cf::cede_to_tick;
2984 }
2985
2986 cf::anim::invalidate_all; # d'oh
2987 }
2988
2989 {
2990 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource};
2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2999
3000 if ($info->{type} & 1) {
3001 # prepend meta info
3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
3009 } else {
3010 $data = $info->{data};
3011 }
3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick;
3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 }
3037
3038 1
3039}
3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
3054 load_resource_file "$MAPDIR/regions"
3055 or die "unable to load regions file\n";
3056
3057 for (cf::region::list) {
3058 $_->{match} = qr/$_->{match}/
3059 if exists $_->{match};
3060 }
3061}
3062
3063sub reload_facedata {
3064 load_facedata "$DATADIR/facedata"
3065 or die "unable to load facedata\n";
3066}
3067
3068sub reload_archetypes {
3069 load_resource_file "$DATADIR/archetypes"
3070 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
3074 load_resource_file "$DATADIR/archetypes"
3075 or die "unable to load archetypes\n";
3076}
3077
3078sub reload_treasures {
3079 load_resource_file "$DATADIR/treasures"
3080 or die "unable to load treasurelists\n";
3081}
3082
3083sub reload_resources {
3084 warn "reloading resource files...\n";
3085
3086 reload_regions;
3087 reload_facedata;
3088 #reload_archetypes;#d#
3089 reload_archetypes;
3090 reload_treasures;
3091
3092 warn "finished reloading resource files\n";
3093}
3094
3095sub init {
3096 reload_resources;
3097}
3098
3099sub reload_config {
2194 open my $fh, "<:utf8", cf::confdir . "/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2195 or return; 3101 or return;
2196 3102
2197 local $/; 3103 local $/;
2198 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
2199 3105
2213 3119
2214sub main { 3120sub main {
2215 # we must not ever block the main coroutine 3121 # we must not ever block the main coroutine
2216 local $Coro::idle = sub { 3122 local $Coro::idle = sub {
2217 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3123 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124 (async {
2218 async { Event::one_event }; 3125 Event::one_event;
3126 })->prio (Coro::PRIO_MAX);
2219 }; 3127 };
2220 3128
2221 cfg_load; 3129 reload_config;
2222 db_load; 3130 db_init;
2223 load_extensions; 3131 load_extensions;
3132
3133 $TICK_WATCHER->start;
2224 Event::loop; 3134 Event::loop;
2225} 3135}
2226 3136
2227############################################################################# 3137#############################################################################
2228# initialisation and cleanup 3138# initialisation and cleanup
2229 3139
2230# install some emergency cleanup handlers 3140# install some emergency cleanup handlers
2231BEGIN { 3141BEGIN {
2232 for my $signal (qw(INT HUP TERM)) { 3142 for my $signal (qw(INT HUP TERM)) {
2233 Event->signal ( 3143 Event->signal (
3144 reentrant => 0,
2234 data => WF_AUTOCANCEL, 3145 data => WF_AUTOCANCEL,
2235 signal => $signal, 3146 signal => $signal,
3147 prio => 0,
2236 cb => sub { 3148 cb => sub {
2237 cf::cleanup "SIG$signal"; 3149 cf::cleanup "SIG$signal";
2238 }, 3150 },
2239 ); 3151 );
2240 } 3152 }
3153}
3154
3155sub write_runtime {
3156 my $runtime = "$LOCALDIR/runtime";
3157
3158 # first touch the runtime file to show we are still running:
3159 # the fsync below can take a very very long time.
3160
3161 IO::AIO::aio_utime $runtime, undef, undef;
3162
3163 my $guard = cf::lock_acquire "write_runtime";
3164
3165 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3166 or return;
3167
3168 my $value = $cf::RUNTIME + 90 + 10;
3169 # 10 is the runtime save interval, for a monotonic clock
3170 # 60 allows for the watchdog to kill the server.
3171
3172 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3173 and return;
3174
3175 # always fsync - this file is important
3176 aio_fsync $fh
3177 and return;
3178
3179 # touch it again to show we are up-to-date
3180 aio_utime $fh, undef, undef;
3181
3182 close $fh
3183 or return;
3184
3185 aio_rename "$runtime~", $runtime
3186 and return;
3187
3188 warn "runtime file written.\n";
3189
3190 1
2241} 3191}
2242 3192
2243sub emergency_save() { 3193sub emergency_save() {
2244 my $freeze_guard = cf::freeze_mainloop; 3194 my $freeze_guard = cf::freeze_mainloop;
2245 3195
2262 my $map = $cf::MAP{$path} or next; 3212 my $map = $cf::MAP{$path} or next;
2263 $map->valid or next; 3213 $map->valid or next;
2264 $map->save; 3214 $map->save;
2265 } 3215 }
2266 warn "end emergency map save\n"; 3216 warn "end emergency map save\n";
3217
3218 warn "begin emergency database checkpoint\n";
3219 BDB::db_env_txn_checkpoint $DB_ENV;
3220 warn "end emergency database checkpoint\n";
2267 }; 3221 };
2268 3222
2269 warn "leave emergency perl save\n"; 3223 warn "leave emergency perl save\n";
2270} 3224}
2271 3225
3226sub post_cleanup {
3227 my ($make_core) = @_;
3228
3229 warn Carp::longmess "post_cleanup backtrace"
3230 if $make_core;
3231}
3232
2272sub reload() { 3233sub do_reload_perl() {
2273 # can/must only be called in main 3234 # can/must only be called in main
2274 if ($Coro::current != $Coro::main) { 3235 if ($Coro::current != $Coro::main) {
2275 warn "can only reload from main coroutine\n"; 3236 warn "can only reload from main coroutine";
2276 return; 3237 return;
2277 } 3238 }
2278 3239
2279 warn "reloading..."; 3240 warn "reloading...";
2280 3241
2281 warn "freezing server"; 3242 warn "entering sync_job";
2282 my $guard = freeze_mainloop; 3243
3244 cf::sync_job {
3245 cf::write_runtime; # external watchdog should not bark
2283 cf::emergency_save; 3246 cf::emergency_save;
3247 cf::write_runtime; # external watchdog should not bark
2284 3248
2285 warn "sync database to disk"; 3249 warn "syncing database to disk";
2286 cf::db_sync; 3250 BDB::db_env_txn_checkpoint $DB_ENV;
2287 IO::AIO::flush;
2288 3251
2289 eval {
2290 # if anything goes wrong in here, we should simply crash as we already saved 3252 # if anything goes wrong in here, we should simply crash as we already saved
2291 3253
2292 warn "cancel all watchers"; 3254 warn "cancelling all WF_AUTOCANCEL watchers";
2293 for (Event::all_watchers) { 3255 for (Event::all_watchers) {
2294 $_->cancel if $_->data & WF_AUTOCANCEL; 3256 $_->cancel if $_->data & WF_AUTOCANCEL;
2295 } 3257 }
2296 3258
3259 warn "flushing outstanding aio requests";
3260 for (;;) {
3261 BDB::flush;
3262 IO::AIO::flush;
3263 Coro::cede;
3264 last unless IO::AIO::nreqs || BDB::nreqs;
3265 warn "iterate...";
3266 }
3267
3268 ++$RELOAD;
3269
2297 warn "cancel all extension coros"; 3270 warn "cancelling all extension coros";
2298 $_->cancel for values %EXT_CORO; 3271 $_->cancel for values %EXT_CORO;
2299 %EXT_CORO = (); 3272 %EXT_CORO = ();
2300 3273
2301 warn "remove commands"; 3274 warn "removing commands";
2302 %COMMAND = (); 3275 %COMMAND = ();
2303 3276
2304 warn "remove ext commands"; 3277 warn "removing ext/exti commands";
2305 %EXTCMD = (); 3278 %EXTCMD = ();
3279 %EXTICMD = ();
2306 3280
2307 warn "unload/nuke all extensions"; 3281 warn "unloading/nuking all extensions";
2308 for my $pkg (@EXTS) { 3282 for my $pkg (@EXTS) {
2309 warn "... unloading $pkg"; 3283 warn "... unloading $pkg";
2310 3284
2311 if (my $cb = $pkg->can ("unload")) { 3285 if (my $cb = $pkg->can ("unload")) {
2312 eval { 3286 eval {
2317 3291
2318 warn "... nuking $pkg"; 3292 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg; 3293 Symbol::delete_package $pkg;
2320 } 3294 }
2321 3295
2322 warn "unload all perl modules loaded from $LIBDIR"; 3296 warn "unloading all perl modules loaded from $LIBDIR";
2323 while (my ($k, $v) = each %INC) { 3297 while (my ($k, $v) = each %INC) {
2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3298 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2325 3299
2326 warn "removing <$k>"; 3300 warn "... unloading $k";
2327 delete $INC{$k}; 3301 delete $INC{$k};
2328 3302
2329 $k =~ s/\.pm$//; 3303 $k =~ s/\.pm$//;
2330 $k =~ s/\//::/g; 3304 $k =~ s/\//::/g;
2331 3305
2334 } 3308 }
2335 3309
2336 Symbol::delete_package $k; 3310 Symbol::delete_package $k;
2337 } 3311 }
2338 3312
2339 warn "get rid of safe::, as good as possible"; 3313 warn "getting rid of safe::, as good as possible";
2340 Symbol::delete_package "safe::$_" 3314 Symbol::delete_package "safe::$_"
2341 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3315 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2342 3316
2343 warn "unload cf.pm \"a bit\""; 3317 warn "unloading cf.pm \"a bit\"";
2344 delete $INC{"cf.pm"}; 3318 delete $INC{"cf.pm"};
3319 delete $INC{"cf/pod.pm"};
2345 3320
2346 # don't, removes xs symbols, too, 3321 # don't, removes xs symbols, too,
2347 # and global variables created in xs 3322 # and global variables created in xs
2348 #Symbol::delete_package __PACKAGE__; 3323 #Symbol::delete_package __PACKAGE__;
2349 3324
3325 warn "unload completed, starting to reload now";
3326
2350 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
2351 require cf; 3328 require cf;
2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2353 3330
2354 warn "load config and database again"; 3331 warn "loading config and database again";
2355 cf::cfg_load; 3332 cf::reload_config;
2356 cf::db_load;
2357 3333
2358 warn "load extensions"; 3334 warn "loading extensions";
2359 cf::load_extensions; 3335 cf::load_extensions;
2360 3336
2361 warn "reattach attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
2362 _global_reattach; 3338 _global_reattach; # objects, sockets
2363 warn "reattach attachments to maps"; 3339 warn "reattaching attachments to maps";
2364 reattach $_ for values %MAP; 3340 reattach $_ for values %MAP;
2365 }; 3341 warn "reattaching attachments to players";
3342 reattach $_ for values %PLAYER;
2366 3343
2367 if ($@) { 3344 warn "leaving sync_job";
3345
3346 1
3347 } or do {
2368 warn $@; 3348 warn $@;
2369 warn "error while reloading, exiting."; 3349 warn "error while reloading, exiting.";
2370 exit 1; 3350 exit 1;
2371 } 3351 };
2372 3352
2373 warn "reloaded"; 3353 warn "reloaded";
2374}; 3354};
2375 3355
3356our $RELOAD_WATCHER; # used only during reload
3357
3358sub reload_perl() {
3359 # doing reload synchronously and two reloads happen back-to-back,
3360 # coro crashes during coro_state_free->destroy here.
3361
3362 $RELOAD_WATCHER ||= Event->timer (
3363 reentrant => 0,
3364 after => 0,
3365 data => WF_AUTOCANCEL,
3366 cb => sub {
3367 do_reload_perl;
3368 undef $RELOAD_WATCHER;
3369 },
3370 );
3371}
3372
2376register_command "reload" => sub { 3373register_command "reload" => sub {
2377 my ($who, $arg) = @_; 3374 my ($who, $arg) = @_;
2378 3375
2379 if ($who->flag (FLAG_WIZ)) { 3376 if ($who->flag (FLAG_WIZ)) {
2380 $who->message ("start of reload.");
2381 reload;
2382 $who->message ("end of reload."); 3377 $who->message ("reloading server.");
3378 async { reload_perl };
2383 } 3379 }
2384}; 3380};
2385 3381
2386unshift @INC, $LIBDIR; 3382unshift @INC, $LIBDIR;
2387 3383
3384my $bug_warning = 0;
3385
3386our @WAIT_FOR_TICK;
3387our @WAIT_FOR_TICK_BEGIN;
3388
3389sub wait_for_tick {
3390 return unless $TICK_WATCHER->is_active;
3391 return if $Coro::current == $Coro::main;
3392
3393 my $signal = new Coro::Signal;
3394 push @WAIT_FOR_TICK, $signal;
3395 $signal->wait;
3396}
3397
3398sub wait_for_tick_begin {
3399 return unless $TICK_WATCHER->is_active;
3400 return if $Coro::current == $Coro::main;
3401
3402 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait;
3405}
3406
3407 my $min = 1e6;#d#
3408 my $avg = 10;
2388$TICK_WATCHER = Event->timer ( 3409$TICK_WATCHER = Event->timer (
2389 reentrant => 0, 3410 reentrant => 0,
3411 parked => 1,
2390 prio => 0, 3412 prio => 0,
2391 at => $NEXT_TICK || $TICK, 3413 at => $NEXT_TICK || $TICK,
2392 data => WF_AUTOCANCEL, 3414 data => WF_AUTOCANCEL,
2393 cb => sub { 3415 cb => sub {
3416 if ($Coro::current != $Coro::main) {
3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3418 unless ++$bug_warning > 10;
3419 return;
3420 }
3421
2394 $NOW = Event::time; 3422 $NOW = $tick_start = Event::time;
2395 3423
2396 cf::server_tick; # one server iteration 3424 cf::server_tick; # one server iteration
3425
3426 0 && sync_job {#d#
3427 for(1..10) {
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 };
3448
2397 $RUNTIME += $TICK; 3449 $RUNTIME += $TICK;
2398 $NEXT_TICK += $TICK; 3450 $NEXT_TICK += $TICK;
2399 3451
2400 $WAIT_FOR_TICK->broadcast; 3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2401 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3453 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool {
3455 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!";
3457 };
3458 }
3459
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send;
3465 }
3466 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send;
3468 }
3469
3470 $NOW = Event::time;
2402 3471
2403 # if we are delayed by four ticks or more, skip them all 3472 # if we are delayed by four ticks or more, skip them all
2404 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2405 3474
2406 $TICK_WATCHER->at ($NEXT_TICK); 3475 $TICK_WATCHER->at ($NEXT_TICK);
2407 $TICK_WATCHER->start; 3476 $TICK_WATCHER->start;
3477
3478 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480
3481 _post_tick;
3482
3483
2408 }, 3484 },
2409); 3485);
2410 3486
3487{
3488 BDB::max_poll_time $TICK * 0.1;
3489 $BDB_POLL_WATCHER = Event->io (
3490 reentrant => 0,
3491 fd => BDB::poll_fileno,
3492 poll => 'r',
3493 prio => 0,
3494 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb,
3496 );
3497 BDB::min_parallel 8;
3498
3499 BDB::set_sync_prepare {
3500 my $status;
3501 my $current = $Coro::current;
3502 (
3503 sub {
3504 $status = $!;
3505 $current->ready; undef $current;
3506 },
3507 sub {
3508 Coro::schedule while defined $current;
3509 $! = $status;
3510 },
3511 )
3512 };
3513
3514 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create;
3516
3517 cf::sync_job {
3518 eval {
3519 BDB::db_env_open
3520 $DB_ENV,
3521 $BDBDIR,
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666;
3525
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 };
3531
3532 cf::cleanup "db_env_open(db): $@" if $@;
3533 };
3534 }
3535}
3536
3537{
3538 IO::AIO::min_parallel 8;
3539
3540 undef $Coro::AIO::WATCHER;
2411IO::AIO::max_poll_time $TICK * 0.2; 3541 IO::AIO::max_poll_time $TICK * 0.1;
2412
2413$AIO_POLL_WATCHER = Event->io ( 3542 $AIO_POLL_WATCHER = Event->io (
2414 fd => IO::AIO::poll_fileno, 3543 reentrant => 0,
2415 poll => 'r',
2416 prio => 5,
2417 data => WF_AUTOCANCEL,
2418 cb => \&IO::AIO::poll_cb,
2419);
2420
2421$WRITE_RUNTIME_WATCHER = Event->timer (
2422 data => WF_AUTOCANCEL, 3544 data => WF_AUTOCANCEL,
2423 after => 0, 3545 fd => IO::AIO::poll_fileno,
2424 interval => 10, 3546 poll => 'r',
2425 cb => sub { 3547 prio => 6,
2426 (Coro::unblock_sub { 3548 cb => \&IO::AIO::poll_cb,
2427 write_runtime 3549 );
2428 or warn "ERROR: unable to write runtime file: $!"; 3550}
3551
3552my $_log_backtrace;
3553
3554sub _log_backtrace {
3555 my ($msg, @addr) = @_;
3556
3557 $msg =~ s/\n//;
3558
3559 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace;
3562 async {
3563 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!";
3568
3569 my @funcs;
3570 my @res = <$fh>;
3571 chomp for @res;
3572 while (@res) {
3573 my ($func, $line) = splice @res, 0, 2, ();
3574 push @funcs, "[$func] $line";
3575 }
3576
3577 @funcs
3578 };
3579
3580 LOG llevInfo, "[ABT] $msg\n";
3581 LOG llevInfo, "[ABT] $_\n" for @bt;
3582 --$_log_backtrace;
2429 })->(); 3583 };
3584 } else {
3585 LOG llevInfo, "[ABT] $msg\n";
3586 LOG llevInfo, "[ABT] [suppressed]\n";
2430 }, 3587 }
2431); 3588}
3589
3590# load additional modules
3591use cf::pod;
2432 3592
2433END { cf::emergency_save } 3593END { cf::emergency_save }
2434 3594
24351 35951
2436 3596

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines