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.113 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.152 by root, Mon Jan 8 22:32:10 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
119 utf8::encode $msg; 118 utf8::encode $msg;
120 119
121 $msg .= "\n" 120 $msg .= "\n"
122 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
123 122
124 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
125 }; 124 };
126} 125}
127 126
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
185=item cf::lock_wait $string
186
187Wait until the given lock is available. See cf::lock_acquire.
188
189=item my $lock = cf::lock_acquire $string
190
191Wait until the given lock is available and then acquires it and returns
192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
193for example when the coroutine gets canceled), the lock is automatically
194returned.
195
196Lock names should begin with a unique identifier (for example, cf::map::find
197uses map_find and cf::map::load uses map_load).
198
199=cut
200
201our %LOCK;
202
203sub lock_wait($) {
204 my ($key) = @_;
205
206 # wait for lock, if any
207 while ($LOCK{$key}) {
208 push @{ $LOCK{$key} }, $Coro::current;
209 Coro::schedule;
210 }
211}
212
213sub lock_acquire($) {
214 my ($key) = @_;
215
216 # wait, to be sure we are not locked
217 lock_wait $key;
218
219 $LOCK{$key} = [];
220
221 Coro::guard {
222 # wake up all waiters, to be on the safe side
223 $_->ready for @{ delete $LOCK{$key} };
224 }
225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
244
186=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
187 246
188The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
203 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
205 264
206 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 266 # (but this is cancel-safe)
208 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
209 268
210 my $busy = 1; 269 my $busy = 1;
211 my @res; 270 my @res;
212 271
213 (Coro::async { 272 (async {
214 @res = eval { $job->() }; 273 @res = eval { $job->() };
215 warn $@ if $@; 274 warn $@ if $@;
216 undef $busy; 275 undef $busy;
217 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
218 277
219 while ($busy) { 278 while ($busy) {
220 Coro::cede_notself; 279 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 280 }
223 281
224 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
225 } else { 283 } else {
226 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
227 285
228 $job->() 286 $job->()
229 } 287 }
230} 288}
231 289
232=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
233 291
234Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 293extension calling this is being unloaded.
236 294
237=cut 295=cut
238 296
239sub coro(&) { 297sub async_ext(&) {
240 my $cb = shift; 298 my $cb = shift;
241 299
242 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 301
249 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
251 }); 304 });
252 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
289 342
290 $path = $path->as_string if ref $path; 343 $path = $path->as_string if ref $path;
291 344
292 my $self = bless { }, $class; 345 my $self = bless { }, $class;
293 346
347 # {... are special paths that are not touched
348 # ?xxx/... are special absolute paths
349 # ?random/... random maps
350 # /! non-realised random map exit
351 # /... normal maps
352 # ~/... per-player maps without a specific player (DO NOT USE)
353 # ~user/... per-player map of a specific user
354
355 if ($path =~ /^{/) {
356 # fine as it is
294 if ($path =~ s{^\?random/}{}) { 357 } elsif ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 358 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data; 359 $self->{random} = cf::from_json $data;
297 } else { 360 } else {
298 if ($path =~ s{^~([^/]+)?}{}) { 361 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1; 362 $self->{user_rel} = 1;
807 (aio_load "$filename.pst", $av) >= 0 870 (aio_load "$filename.pst", $av) >= 0
808 or return; 871 or return;
809 $av = eval { (Storable::thaw $av)->{objs} }; 872 $av = eval { (Storable::thaw $av)->{objs} };
810 } 873 }
811 874
875 warn sprintf "loading %s (%d)\n",
876 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 877 return ($data, $av);
813} 878}
814 879
815############################################################################# 880#############################################################################
816# command handling &c 881# command handling &c
1007 1072
1008=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1009 1074
1010Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1011 1076
1077=cut
1078
1079package cf::player;
1080
1012=head3 cf::player 1081=head3 cf::player
1013 1082
1014=over 4 1083=over 4
1015 1084
1016=item cf::player::exists $login 1085=item cf::player::find $login
1017 1086
1018Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1019 1088
1020=cut 1089=cut
1021 1090
1022sub cf::player::exists($) { 1091sub playerdir($) {
1023 cf::player::find $_[0] 1092 cf::localdir
1024 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$_[0]} || do {
1125 my $pl = load_pl path $login
1126 or return;
1127 $cf::PLAYER{$login} = $pl
1128 }
1129 }
1130}
1131
1132sub save($) {
1133 my ($pl) = @_;
1134
1135 return if $pl->{deny_save};
1136
1137 my $path = path $pl;
1138 my $guard = cf::lock_acquire "user_save:$path";
1139
1140 return if $pl->{deny_save};
1141
1142 Coro::AIO::aio_mkdir playerdir $pl, 0770;
1143 $pl->{last_save} = $cf::RUNTIME;
1144
1145 $pl->save_pl ($path);
1146 Coro::cede;
1147}
1148
1149sub new($) {
1150 my ($login) = @_;
1151
1152 my $self = create;
1153
1154 $self->ob->name ($login);
1155 $self->{deny_save} = 1;
1156
1157 $cf::PLAYER{$login} = $self;
1158
1159 $self
1160}
1161
1162sub quit_character {
1163 my ($pl) = @_;
1164
1165 $pl->{deny_save} = 1;
1166 $pl->password ("*"); # this should lock out the player until we nuked the dir
1167
1168 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1169 $pl->deactivate;
1170 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1171 $pl->ns->destroy if $pl->ns;
1172
1173 my $path = playerdir $pl;
1174 my $temp = "$path~$cf::RUNTIME~deleting~";
1175 Coro::AIO::aio_rename $path, $temp;
1176 delete $cf::PLAYER{$pl->ob->name};
1177 $pl->destroy;
1178 IO::AIO::aio_rmtree $temp;
1025} 1179}
1026 1180
1027=item $player->ext_reply ($msgid, $msgtype, %msg) 1181=item $player->ext_reply ($msgid, $msgtype, %msg)
1028 1182
1029Sends an ext reply to the player. 1183Sends an ext reply to the player.
1030 1184
1031=cut 1185=cut
1032 1186
1033sub cf::player::ext_reply($$$%) { 1187sub ext_reply($$$%) {
1034 my ($self, $id, %msg) = @_; 1188 my ($self, $id, %msg) = @_;
1035 1189
1036 $msg{msgid} = $id; 1190 $msg{msgid} = $id;
1037 1191
1038 $self->send ("ext " . to_json \%msg); 1192 $self->send ("ext " . cf::to_json \%msg);
1039} 1193}
1194
1195package cf;
1040 1196
1041=back 1197=back
1042 1198
1043 1199
1044=head3 cf::map 1200=head3 cf::map
1050package cf::map; 1206package cf::map;
1051 1207
1052use Fcntl; 1208use Fcntl;
1053use Coro::AIO; 1209use Coro::AIO;
1054 1210
1055our $MAX_RESET = 7200; 1211our $MAX_RESET = 3600;
1056our $DEFAULT_RESET = 3600; 1212our $DEFAULT_RESET = 3000;
1057 1213
1058sub generate_random_map { 1214sub generate_random_map {
1059 my ($path, $rmp) = @_; 1215 my ($path, $rmp) = @_;
1060 1216
1061 # mit "rum" bekleckern, nicht 1217 # mit "rum" bekleckern, nicht
1077# and all this just because we cannot iterate over 1233# and all this just because we cannot iterate over
1078# all maps in C++... 1234# all maps in C++...
1079sub change_all_map_light { 1235sub change_all_map_light {
1080 my ($change) = @_; 1236 my ($change) = @_;
1081 1237
1082 $_->change_map_light ($change) for values %cf::MAP; 1238 $_->change_map_light ($change)
1239 for grep $_->outdoor, values %cf::MAP;
1083} 1240}
1084 1241
1085sub try_load_header($) { 1242sub try_load_header($) {
1086 my ($path) = @_; 1243 my ($path) = @_;
1087 1244
1090 or return; 1247 or return;
1091 1248
1092 my $map = cf::map::new 1249 my $map = cf::map::new
1093 or return; 1250 or return;
1094 1251
1252 # for better error messages only, will be overwritten
1253 $map->path ($path);
1254
1095 $map->load_header ($path) 1255 $map->load_header ($path)
1096 or return; 1256 or return;
1097 1257
1098 $map->{load_path} = $path; 1258 $map->{load_path} = $path;
1099 1259
1100 $map 1260 $map
1101} 1261}
1102 1262
1263sub find;
1103sub find_map { 1264sub find {
1104 my ($path, $origin) = @_; 1265 my ($path, $origin) = @_;
1105 1266
1106 #warn "find_map<$path,$origin>\n";#d# 1267 #warn "find<$path,$origin>\n";#d#
1107 1268
1108 $path = new cf::path $path, $origin && $origin->path; 1269 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1270 my $key = $path->as_string;
1110 1271
1272 cf::lock_wait "map_find:$key";
1273
1111 $cf::MAP{$key} || do { 1274 $cf::MAP{$key} || do {
1275 my $guard = cf::lock_acquire "map_find:$key";
1276
1112 # do it the slow way 1277 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1278 my $map = try_load_header $path->save_path;
1114 1279
1280 Coro::cede;
1281
1115 if ($map) { 1282 if ($map) {
1283 $map->last_access ((delete $map->{last_access})
1284 || $cf::RUNTIME); #d#
1116 # safety 1285 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME 1286 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME; 1287 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else { 1288 } else {
1120 if (my $rmp = $path->random_map_params) { 1289 if (my $rmp = $path->random_map_params) {
1125 1294
1126 $map or return; 1295 $map or return;
1127 1296
1128 $map->{load_original} = 1; 1297 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME; 1298 $map->{instantiate_time} = $cf::RUNTIME;
1299 $map->last_access ($cf::RUNTIME);
1130 $map->instantiate; 1300 $map->instantiate;
1131 1301
1132 # per-player maps become, after loading, normal maps 1302 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel}; 1303 $map->per_player (0) if $path->{user_rel};
1134 } 1304 }
1135 1305
1136 $map->path ($key); 1306 $map->path ($key);
1137 $map->{path} = $path; 1307 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1308 $map->{last_save} = $cf::RUNTIME;
1309
1310 Coro::cede;
1139 1311
1140 if ($map->should_reset) { 1312 if ($map->should_reset) {
1141 $map->reset; 1313 $map->reset;
1314 undef $guard;
1142 $map = find_map $path; 1315 $map = find $path
1316 or return;
1143 } 1317 }
1144 1318
1145 $cf::MAP{$key} = $map 1319 $cf::MAP{$key} = $map
1146 } 1320 }
1147} 1321}
1148 1322
1149sub load { 1323sub load {
1150 my ($self) = @_; 1324 my ($self) = @_;
1151 1325
1326 my $path = $self->{path};
1327 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1328
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1329 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1330
1154 $self->in_memory (cf::MAP_LOADING); 1331 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1332
1158 $self->alloc; 1333 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1334 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1335 or return;
1161 1336
1167 if (aio_open $uniq, O_RDONLY, 0) { 1342 if (aio_open $uniq, O_RDONLY, 0) {
1168 $self->clear_unique_items; 1343 $self->clear_unique_items;
1169 $self->load_objects ($uniq, 0); 1344 $self->load_objects ($uniq, 0);
1170 } 1345 }
1171 } 1346 }
1347
1348 Coro::cede;
1172 1349
1173 # now do the right thing for maps 1350 # now do the right thing for maps
1174 $self->link_multipart_objects; 1351 $self->link_multipart_objects;
1175 1352
1176 if ($self->{path}->is_style_map) { 1353 if ($self->{path}->is_style_map) {
1184 $self->difficulty ($self->estimate_difficulty) 1361 $self->difficulty ($self->estimate_difficulty)
1185 unless $self->difficulty; 1362 unless $self->difficulty;
1186 $self->activate; 1363 $self->activate;
1187 } 1364 }
1188 1365
1366 Coro::cede;
1367
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1368 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1369}
1191 1370
1192sub load_map_sync { 1371sub find_sync {
1193 my ($path, $origin) = @_; 1372 my ($path, $origin) = @_;
1194 1373
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1374 cf::sync_job { cf::map::find $path, $origin }
1375}
1196 1376
1197 cf::sync_job { 1377sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1378 my ($map) = @_;
1199 or return; 1379
1200 $map->load; 1380 cf::sync_job { $map->load };
1201 $map
1202 }
1203} 1381}
1204 1382
1205sub save { 1383sub save {
1206 my ($self) = @_; 1384 my ($self) = @_;
1207 1385
1386 my $lock = cf::lock_acquire "map_data:" . $self->path;
1387
1388 $self->{last_save} = $cf::RUNTIME;
1389
1390 return unless $self->dirty;
1391
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1392 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1393 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1394
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214
1215 $self->{load_path} = $save; 1395 $self->{load_path} = $save;
1216 1396
1217 return if $self->{deny_save}; 1397 return if $self->{deny_save};
1398
1399 local $self->{last_access} = $self->last_access;#d#
1400
1401 cf::async {
1402 $_->contr->save for $self->players;
1403 };
1218 1404
1219 if ($uniq) { 1405 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1406 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1407 $self->save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1408 } else {
1225} 1411}
1226 1412
1227sub swap_out { 1413sub swap_out {
1228 my ($self) = @_; 1414 my ($self) = @_;
1229 1415
1416 # save first because save cedes
1417 $self->save;
1418
1419 my $lock = cf::lock_acquire "map_data:" . $self->path;
1420
1230 return if $self->players; 1421 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1422 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1423 return if $self->{deny_save};
1233 1424
1234 $self->save;
1235 $self->clear; 1425 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1426 $self->in_memory (cf::MAP_SWAPPED);
1237} 1427}
1238 1428
1239sub reset_at { 1429sub reset_at {
1240 my ($self) = @_; 1430 my ($self) = @_;
1241 1431
1242 # TODO: safety, remove and allow resettable per-player maps 1432 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1433 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1434 return 1e99 if $self->{deny_reset};
1245 1435
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1436 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1437 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1438
1250 $time + $to 1439 $time + $to
1251} 1440}
1252 1441
1253sub should_reset { 1442sub should_reset {
1269 1458
1270 $self->unlink_save; 1459 $self->unlink_save;
1271 1460
1272 delete $cf::MAP{$self->path}; 1461 delete $cf::MAP{$self->path};
1273 $self->{path} = new cf::path $new_path; 1462 $self->{path} = new cf::path $new_path;
1274 $self->path ($self->{path}->path); 1463 $self->path ($self->{path}->as_string);
1275 $cf::MAP{$self->path} = $self; 1464 $cf::MAP{$self->path} = $self;
1276 1465
1277 $self->save; 1466 $self->save;
1278} 1467}
1279 1468
1280sub reset { 1469sub reset {
1281 my ($self) = @_; 1470 my ($self) = @_;
1282 1471
1472 my $lock = cf::lock_acquire "map_data:" . $self->path;
1473
1283 return if $self->players; 1474 return if $self->players;
1284 return if $self->{path}{user_rel};#d# 1475 return if $self->{path}{user_rel};#d#
1285 1476
1286 warn "resetting map ", $self->path;#d# 1477 warn "resetting map ", $self->path;#d#
1287 1478
1291 1482
1292 $self->unlink_save; 1483 $self->unlink_save;
1293 $self->destroy; 1484 $self->destroy;
1294} 1485}
1295 1486
1487my $nuke_counter = "aaaa";
1488
1489sub nuke {
1490 my ($self) = @_;
1491
1492 $self->{deny_save} = 1;
1493 $self->reset_timeout (1);
1494 $self->rename ("{nuke}/" . ($nuke_counter++));
1495 $self->reset; # polite request, might not happen
1496}
1497
1296sub customise_for { 1498sub customise_for {
1297 my ($map, $ob) = @_; 1499 my ($map, $ob) = @_;
1298 1500
1299 if ($map->per_player) { 1501 if ($map->per_player) {
1300 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1502 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1301 } 1503 }
1302 1504
1303 $map 1505 $map
1304} 1506}
1305 1507
1306sub emergency_save { 1508sub emergency_save {
1307 local $cf::FREEZE = 1; 1509 my $freeze_guard = cf::freeze_mainloop;
1308 1510
1309 warn "enter emergency map save\n"; 1511 warn "enter emergency perl save\n";
1310 1512
1311 cf::sync_job { 1513 cf::sync_job {
1514 warn "begin emergency player save\n";
1515 $_->save for values %cf::PLAYER;
1516 warn "end emergency player save\n";
1517
1312 warn "begin emergency map save\n"; 1518 warn "begin emergency map save\n";
1313 $_->save for values %cf::MAP; 1519 $_->save for values %cf::MAP;
1520 warn "end emergency map save\n";
1314 }; 1521 };
1315 1522
1316 warn "end emergency map save\n"; 1523 warn "leave emergency perl save\n";
1317} 1524}
1318 1525
1319package cf; 1526package cf;
1320 1527
1321=back 1528=back
1363 (ref $cf::CFG{"may_$access"} 1570 (ref $cf::CFG{"may_$access"}
1364 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1571 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1365 : $cf::CFG{"may_$access"}) 1572 : $cf::CFG{"may_$access"})
1366} 1573}
1367 1574
1575=item $player_object->enter_link
1576
1577Freezes the player and moves him/her to a special map (C<{link}>).
1578
1579The player should be reaosnably safe there for short amounts of time. You
1580I<MUST> call C<leave_link> as soon as possible, though.
1581
1582=item $player_object->leave_link ($map, $x, $y)
1583
1584Moves the player out of the specila link map onto the given map. If the
1585map is not valid (or omitted), the player will be moved back to the
1586location he/she was before the call to C<enter_link>, or, if that fails,
1587to the emergency map position.
1588
1589Might block.
1590
1591=cut
1592
1368sub cf::object::player::enter_link { 1593sub cf::object::player::enter_link {
1369 my ($self) = @_; 1594 my ($self) = @_;
1370 1595
1596 $self->deactivate_recursive;
1597
1371 return if $self->map == $LINK_MAP; 1598 return if $self->map == $LINK_MAP;
1372 1599
1373 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1600 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1374 if $self->map; 1601 if $self->map;
1375 1602
1376 $self->enter_map ($LINK_MAP, 20, 20); 1603 $self->enter_map ($LINK_MAP, 20, 20);
1377 $self->deactivate_recursive;
1378} 1604}
1379 1605
1380sub cf::object::player::leave_link { 1606sub cf::object::player::leave_link {
1381 my ($self, $map, $x, $y) = @_; 1607 my ($self, $map, $x, $y) = @_;
1382 1608
1383 my $link_pos = delete $self->{_link_pos}; 1609 my $link_pos = delete $self->{_link_pos};
1384 1610
1385 unless ($map) { 1611 unless ($map) {
1386 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1387
1388 # restore original map position 1612 # restore original map position
1389 ($map, $x, $y) = @{ $link_pos || [] }; 1613 ($map, $x, $y) = @{ $link_pos || [] };
1390 $map = cf::map::find_map $map; 1614 $map = cf::map::find $map;
1391 1615
1392 unless ($map) { 1616 unless ($map) {
1393 ($map, $x, $y) = @$EMERGENCY_POSITION; 1617 ($map, $x, $y) = @$EMERGENCY_POSITION;
1394 $map = cf::map::find_map $map 1618 $map = cf::map::find $map
1395 or die "FATAL: cannot load emergency map\n"; 1619 or die "FATAL: cannot load emergency map\n";
1396 } 1620 }
1397 } 1621 }
1398 1622
1399 ($x, $y) = (-1, -1) 1623 ($x, $y) = (-1, -1)
1403 ($x, $y) = ($map->enter_x, $map->enter_y) 1627 ($x, $y) = ($map->enter_x, $map->enter_y)
1404 if $x <=0 && $y <= 0; 1628 if $x <=0 && $y <= 0;
1405 1629
1406 $map->load; 1630 $map->load;
1407 1631
1632 return unless $self->contr->active;
1408 $self->activate_recursive; 1633 $self->activate_recursive;
1409 $self->enter_map ($map, $x, $y); 1634 $self->enter_map ($map, $x, $y);
1410} 1635}
1411 1636
1637cf::player->attach (
1638 on_logout => sub {
1639 my ($pl) = @_;
1640
1641 # abort map switching before logout
1642 if ($pl->ob->{_link_pos}) {
1643 cf::sync_job {
1644 $pl->ob->leave_link
1645 };
1646 }
1647 },
1648 on_login => sub {
1649 my ($pl) = @_;
1650
1651 # try to abort aborted map switching on player login :)
1652 # should happen only on crashes
1653 if ($pl->ob->{_link_pos}) {
1654 $pl->ob->enter_link;
1655 (async {
1656 # we need this sleep as the login has a concurrent enter_exit running
1657 # and this sleep increases chances of the player not ending up in scorn
1658 $pl->ob->reply (undef,
1659 "There was an internal problem at your last logout, "
1660 . "the server will try to bring you to your intended destination in a second.",
1661 cf::NDI_RED);
1662 Coro::Timer::sleep 1;
1663 $pl->ob->leave_link;
1664 })->prio (2);
1665 }
1666 },
1667);
1668
1412=item $player_object->goto_map ($map, $x, $y) 1669=item $player_object->goto ($path, $x, $y)
1413 1670
1414=cut 1671=cut
1415 1672
1416sub cf::object::player::goto_map { 1673sub cf::object::player::goto {
1417 my ($self, $path, $x, $y) = @_; 1674 my ($self, $path, $x, $y) = @_;
1418 1675
1419 $self->enter_link; 1676 $self->enter_link;
1420 1677
1421 (Coro::async { 1678 (async {
1422 $path = new cf::path $path; 1679 $path = new cf::path $path;
1423 1680
1424 my $map = cf::map::find_map $path->as_string; 1681 my $map = cf::map::find $path->as_string;
1425 $map = $map->customise_for ($self) if $map; 1682 $map = $map->customise_for ($self) if $map;
1426 1683
1427 warn "entering ", $map->path, " at ($x, $y)\n" 1684# warn "entering ", $map->path, " at ($x, $y)\n"
1428 if $map; 1685# if $map;
1686
1687 $map or Carp::cluck ("oy");#d#
1688 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1429 1689
1430 $self->leave_link ($map, $x, $y); 1690 $self->leave_link ($map, $x, $y);
1431 })->prio (1); 1691 })->prio (1);
1432} 1692}
1433 1693
1486 1746
1487 return unless $self->type == cf::PLAYER; 1747 return unless $self->type == cf::PLAYER;
1488 1748
1489 $self->enter_link; 1749 $self->enter_link;
1490 1750
1491 (Coro::async { 1751 (async {
1752 $self->deactivate_recursive; # just to be sure
1492 unless (eval { 1753 unless (eval {
1493
1494 prepare_random_map $exit 1754 prepare_random_map $exit
1495 if $exit->slaying eq "/!"; 1755 if $exit->slaying eq "/!";
1496 1756
1497 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1757 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1498 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1758 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1499 1759
1500 1; 1760 1;
1501 }) { 1761 }) {
1502 $self->message ("Something went wrong deep within the crossfire server. " 1762 $self->message ("Something went wrong deep within the crossfire server. "
1503 . "I'll try to bring you back to the map you were before. " 1763 . "I'll try to bring you back to the map you were before. "
1560 on_reply => sub { 1820 on_reply => sub {
1561 my ($ns, $msg) = @_; 1821 my ($ns, $msg) = @_;
1562 1822
1563 # this weird shuffling is so that direct followup queries 1823 # this weird shuffling is so that direct followup queries
1564 # get handled first 1824 # get handled first
1565 my $queue = delete $ns->{query_queue}; 1825 my $queue = delete $ns->{query_queue}
1826 or return; # be conservative, not sure how that can happen, but we saw a crash here
1566 1827
1567 (shift @$queue)->[1]->($msg); 1828 (shift @$queue)->[1]->($msg);
1568 1829
1569 push @{ $ns->{query_queue} }, @$queue; 1830 push @{ $ns->{query_queue} }, @$queue;
1570 1831
1576 } 1837 }
1577 } 1838 }
1578 }, 1839 },
1579); 1840);
1580 1841
1581=item $client->coro (\&cb) 1842=item $client->async (\&cb)
1582 1843
1583Create a new coroutine, running the specified callback. The coroutine will 1844Create a new coroutine, running the specified callback. The coroutine will
1584be automatically cancelled when the client gets destroyed (e.g. on logout, 1845be automatically cancelled when the client gets destroyed (e.g. on logout,
1585or loss of connection). 1846or loss of connection).
1586 1847
1587=cut 1848=cut
1588 1849
1589sub cf::client::coro { 1850sub cf::client::async {
1590 my ($self, $cb) = @_; 1851 my ($self, $cb) = @_;
1591 1852
1592 my $coro; $coro = async { 1853 my $coro = &Coro::async ($cb);
1593 eval {
1594 $cb->();
1595 };
1596 warn $@ if $@;
1597 };
1598 1854
1599 $coro->on_destroy (sub { 1855 $coro->on_destroy (sub {
1600 delete $self->{_coro}{$coro+0}; 1856 delete $self->{_coro}{$coro+0};
1601 }); 1857 });
1602 1858
1774 2030
1775{ 2031{
1776 my $path = cf::localdir . "/database.pst"; 2032 my $path = cf::localdir . "/database.pst";
1777 2033
1778 sub db_load() { 2034 sub db_load() {
1779 warn "loading database $path\n";#d# remove later
1780 $DB = stat $path ? Storable::retrieve $path : { }; 2035 $DB = stat $path ? Storable::retrieve $path : { };
1781 } 2036 }
1782 2037
1783 my $pid; 2038 my $pid;
1784 2039
1785 sub db_save() { 2040 sub db_save() {
1786 warn "saving database $path\n";#d# remove later
1787 waitpid $pid, 0 if $pid; 2041 waitpid $pid, 0 if $pid;
1788 if (0 == ($pid = fork)) { 2042 if (0 == ($pid = fork)) {
1789 $DB->{_meta}{version} = 1; 2043 $DB->{_meta}{version} = 1;
1790 Storable::nstore $DB, "$path~"; 2044 Storable::nstore $DB, "$path~";
1791 rename "$path~", $path; 2045 rename "$path~", $path;
1839 open my $fh, "<:utf8", cf::confdir . "/config" 2093 open my $fh, "<:utf8", cf::confdir . "/config"
1840 or return; 2094 or return;
1841 2095
1842 local $/; 2096 local $/;
1843 *CFG = YAML::Syck::Load <$fh>; 2097 *CFG = YAML::Syck::Load <$fh>;
2098
2099 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2100
2101 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2102 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2103
2104 if (exists $CFG{mlockall}) {
2105 eval {
2106 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2107 and die "WARNING: m(un)lockall failed: $!\n";
2108 };
2109 warn $@ if $@;
2110 }
1844} 2111}
1845 2112
1846sub main { 2113sub main {
1847 # we must not ever block the main coroutine 2114 # we must not ever block the main coroutine
1848 local $Coro::idle = sub { 2115 local $Coro::idle = sub {
1849 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2116 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1850 (Coro::unblock_sub {
1851 Event::one_event; 2117 async { Event::one_event };
1852 })->();
1853 }; 2118 };
1854 2119
1855 cfg_load; 2120 cfg_load;
1856 db_load; 2121 db_load;
1857 load_extensions; 2122 load_extensions;
1868 return; 2133 return;
1869 } 2134 }
1870 2135
1871 warn "reloading..."; 2136 warn "reloading...";
1872 2137
1873 local $FREEZE = 1; 2138 my $guard = freeze_mainloop;
1874 cf::emergency_save; 2139 cf::emergency_save;
1875 2140
1876 eval { 2141 eval {
1877 # if anything goes wrong in here, we should simply crash as we already saved 2142 # if anything goes wrong in here, we should simply crash as we already saved
1878 2143
1940 cf::load_extensions; 2205 cf::load_extensions;
1941 2206
1942 # reattach attachments to objects 2207 # reattach attachments to objects
1943 warn "reattach"; 2208 warn "reattach";
1944 _global_reattach; 2209 _global_reattach;
2210 reattach $_ for values %MAP;
1945 }; 2211 };
1946 2212
1947 if ($@) { 2213 if ($@) {
1948 warn $@; 2214 warn $@;
1949 warn "error while reloading, exiting."; 2215 warn "error while reloading, exiting.";
1965 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2231 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1966 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2232 $LINK_MAP->in_memory (MAP_IN_MEMORY);
1967 2233
1968 # dirty hack because... archetypes are not yet loaded 2234 # dirty hack because... archetypes are not yet loaded
1969 Event->timer ( 2235 Event->timer (
1970 after => 2, 2236 after => 10,
1971 cb => sub { 2237 cb => sub {
1972 $_[0]->w->cancel; 2238 $_[0]->w->cancel;
1973 2239
1974 # provide some exits "home" 2240 # provide some exits "home"
1975 my $exit = cf::object::new "exit"; 2241 my $exit = cf::object::new "exit";
2014 reentrant => 0, 2280 reentrant => 0,
2015 prio => 0, 2281 prio => 0,
2016 at => $NEXT_TICK || $TICK, 2282 at => $NEXT_TICK || $TICK,
2017 data => WF_AUTOCANCEL, 2283 data => WF_AUTOCANCEL,
2018 cb => sub { 2284 cb => sub {
2019 unless ($FREEZE) {
2020 cf::server_tick; # one server iteration 2285 cf::server_tick; # one server iteration
2021 $RUNTIME += $TICK; 2286 $RUNTIME += $TICK;
2022 }
2023
2024 $NEXT_TICK += $TICK; 2287 $NEXT_TICK += $TICK;
2025 2288
2026 # if we are delayed by four ticks or more, skip them all 2289 # if we are delayed by four ticks or more, skip them all
2027 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2290 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2028 2291
2051 or warn "ERROR: unable to write runtime file: $!"; 2314 or warn "ERROR: unable to write runtime file: $!";
2052 })->(); 2315 })->();
2053 }, 2316 },
2054); 2317);
2055 2318
2319END { cf::emergency_save }
2320
20561 23211
2057 2322

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines